From d31e556e34b73b85184b59dbebba836fe10aa0df Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 00:52:38 +0400 Subject: [PATCH 001/141] feat(bindings): move bindings to root package https://github.com/asyncapi/jasyncapi/issues/184 --- .../com/asyncapi/bindings/ChannelBinding.java | 18 ++++++++++++++++++ .../com/asyncapi/bindings/MessageBinding.java | 13 +++++++++++++ .../asyncapi/bindings/OperationBinding.java | 18 ++++++++++++++++++ .../com/asyncapi/bindings/ServerBinding.java | 18 ++++++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java new file mode 100644 index 00000000..06669e83 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java @@ -0,0 +1,18 @@ +package com.asyncapi.bindings; + +import com.asyncapi.v3.ExtendableObject; +import lombok.EqualsAndHashCode; + +/** + * Describes protocol-specific definition for a channel. + *

+ * This object MAY be extended with {@link ExtendableObject}. + * + * @see Specification Extensions + * @see Channel Binding + * @author Pavel Bodiachevskii + * @version 3.0.0 + */ +@EqualsAndHashCode(callSuper = true) +public class ChannelBinding extends ExtendableObject { +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java new file mode 100644 index 00000000..bd6aa60d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java @@ -0,0 +1,13 @@ +package com.asyncapi.bindings; + +import com.asyncapi.v3.ExtendableObject; +import lombok.EqualsAndHashCode; + +/** + * Describes AsyncAPI message binding. + * + * @author Pavel Bodiachevskii + */ +@EqualsAndHashCode(callSuper = true) +public class MessageBinding extends ExtendableObject { +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java new file mode 100644 index 00000000..f91c2cad --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java @@ -0,0 +1,18 @@ +package com.asyncapi.bindings; + +import com.asyncapi.v3.ExtendableObject; +import lombok.EqualsAndHashCode; + +/** + * Describes protocol-specific definition for an operation. + *

+ * This object MAY be extended with {@link ExtendableObject}. + * + * @see Specification Extensions + * @see Operation Binding + * @author Pavel Bodiachevskii + * @version 3.0.0 + */ +@EqualsAndHashCode(callSuper = true) +public class OperationBinding extends ExtendableObject { +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java new file mode 100644 index 00000000..456d8ef1 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java @@ -0,0 +1,18 @@ +package com.asyncapi.bindings; + +import com.asyncapi.v3.ExtendableObject; +import lombok.EqualsAndHashCode; + +/** + * Describes protocol-specific definition for a server. + *

+ * This object MAY be extended with {@link ExtendableObject}. + * + * @see Specification Extensions + * @see Server Binding + * @author Pavel Bodiachevskii + * @version 3.0.0 + */ +@EqualsAndHashCode(callSuper = true) +public class ServerBinding extends ExtendableObject { +} From 66eb0fffc3afa6ab951aeb87e451133c5bd43f84 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 01:11:05 +0400 Subject: [PATCH 002/141] feat(websockets bindings): v3 use common bindings https://github.com/asyncapi/jasyncapi/issues/183 https://github.com/asyncapi/jasyncapi/issues/184 --- .../channel}/WebSocketsChannelBinding.java | 4 ++-- .../_1_0/channel/WebSocketsChannelMethod.java | 21 +++++++++++++++++++ .../message}/WebSocketsMessageBinding.java | 6 ++++-- .../WebSocketsOperationBinding.java | 8 ++++--- .../_1_0/server}/WebSocketsServerBinding.java | 8 ++++--- .../channel/ws/WebSocketsChannelMethod.java | 13 ------------ .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../v3/_0_0/WebsocketGeminiAsyncAPI.kt | 2 +- .../v3/_0_0/model/server/ServerTest.kt | 2 +- .../ws/WebSocketsChannelBindingTest.kt | 3 +++ 13 files changed, 46 insertions(+), 29 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/ws => bindings/websockets/v0/_1_0/channel}/WebSocketsChannelBinding.java (96%) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelMethod.java rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/ws => bindings/websockets/v0/_1_0/message}/WebSocketsMessageBinding.java (76%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/ws => bindings/websockets/v0/_1_0/operation}/WebSocketsOperationBinding.java (69%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/ws => bindings/websockets/v0/_1_0/server}/WebSocketsServerBinding.java (69%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelMethod.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java index f701f3e9..abe76163 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java @@ -1,7 +1,7 @@ -package com.asyncapi.v3.binding.channel.ws; +package com.asyncapi.bindings.websockets.v0._1_0.channel; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.binding.channel.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelMethod.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelMethod.java new file mode 100644 index 00000000..af2349d5 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelMethod.java @@ -0,0 +1,21 @@ +package com.asyncapi.bindings.websockets.v0._1_0.channel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * The HTTP method to use when establishing the connection. + *

+ * Its value MUST be either GET or POST. + * + * @version 0.1.0 + * @author Pavel Bodiachevskii + */ +public enum WebSocketsChannelMethod { + + @JsonProperty("GET") + GET, + + @JsonProperty("POST") + POST + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ws/WebSocketsMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java similarity index 76% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ws/WebSocketsMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java index 24dd7274..2062506e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ws/WebSocketsMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.ws; +package com.asyncapi.bindings.websockets.v0._1_0.message; import com.asyncapi.v3.binding.message.MessageBinding; import lombok.Data; @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes WebSockets message binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ws/WebSocketsOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java similarity index 69% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ws/WebSocketsOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java index a2e14bc5..96c1dd1e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ws/WebSocketsOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java @@ -1,12 +1,14 @@ -package com.asyncapi.v3.binding.operation.ws; +package com.asyncapi.bindings.websockets.v0._1_0.operation; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes WebSockets operation binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ws/WebSocketsServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java similarity index 69% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ws/WebSocketsServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java index b76ab214..b110be49 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ws/WebSocketsServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java @@ -1,12 +1,14 @@ -package com.asyncapi.v3.binding.server.ws; +package com.asyncapi.bindings.websockets.v0._1_0.server; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes WebSockets server binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelMethod.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelMethod.java deleted file mode 100644 index 48362411..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelMethod.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.asyncapi.v3.binding.channel.ws; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public enum WebSocketsChannelMethod { - - @JsonProperty("GET") - GET, - - @JsonProperty("POST") - POST - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index 38ffac56..5bbabe2e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.v3.binding.channel.solace.SolaceChannelBinding; import com.asyncapi.v3.binding.channel.sqs.SQSChannelBinding; import com.asyncapi.v3.binding.channel.stomp.STOMPChannelBinding; -import com.asyncapi.v3.binding.channel.ws.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index a40a2fe1..081953bb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.v3.binding.message.solace.SolaceMessageBinding; import com.asyncapi.v3.binding.message.sqs.SQSMessageBinding; import com.asyncapi.v3.binding.message.stomp.STOMPMessageBinding; -import com.asyncapi.v3.binding.message.ws.WebSocketsMessageBinding; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index 0b4b86e1..39880639 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.v3.binding.operation.solace.SolaceOperationBinding; import com.asyncapi.v3.binding.operation.sqs.SQSOperationBinding; import com.asyncapi.v3.binding.operation.stomp.STOMPOperationBinding; -import com.asyncapi.v3.binding.operation.ws.WebSocketsOperationBinding; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index c6cfbe04..15ce53ce 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.v3.binding.server.solace.SolaceServerBinding; import com.asyncapi.v3.binding.server.sqs.SQSServerBinding; import com.asyncapi.v3.binding.server.stomp.STOMPServerBinding; -import com.asyncapi.v3.binding.server.ws.WebSocketsServerBinding; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt index baa463b7..5a2a5a03 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt @@ -12,7 +12,7 @@ import com.asyncapi.v3._0_0.model.info.Contact import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.binding.channel.ws.WebSocketsChannelBinding +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding import com.asyncapi.v3.schema.AsyncAPISchema import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index cee89d7a..620e5a61 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -22,7 +22,7 @@ import com.asyncapi.v3.binding.server.sns.SNSServerBinding import com.asyncapi.v3.binding.server.solace.SolaceServerBinding import com.asyncapi.v3.binding.server.sqs.SQSServerBinding import com.asyncapi.v3.binding.server.stomp.STOMPServerBinding -import com.asyncapi.v3.binding.server.ws.WebSocketsServerBinding +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest import com.asyncapi.v3.security_scheme.http.HttpSecuritySchemeBearerTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBindingTest.kt index 1159d1a1..0887dfa6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBindingTest.kt @@ -3,6 +3,9 @@ package com.asyncapi.v3.binding.channel.ws import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod + /** * @version 3.0.0 From 7ec4eaa5ea3c834fd40c1fb4df554bf5baa8601c Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 17:18:56 +0400 Subject: [PATCH 003/141] feat(bindings): use common ChannelBinding and ExtendableObject https://github.com/asyncapi/jasyncapi/issues/184 --- .../asyncapi/{v3 => }/ExtendableObject.java | 2 +- .../com/asyncapi/bindings/ChannelBinding.java | 2 +- .../com/asyncapi/bindings/MessageBinding.java | 2 +- .../asyncapi/bindings/OperationBinding.java | 2 +- .../com/asyncapi/bindings/ServerBinding.java | 2 +- .../com/asyncapi/v2/ExtendableObject.java | 43 ------------------- .../com/asyncapi/v2/_0_0/model/AsyncAPI.java | 2 +- .../v2/_0_0/model/ExternalDocumentation.java | 2 +- .../java/com/asyncapi/v2/_0_0/model/Tag.java | 2 +- .../v2/_0_0/model/channel/ChannelItem.java | 4 +- .../v2/_0_0/model/channel/Parameter.java | 2 +- .../model/channel/message/CorrelationId.java | 2 +- .../_0_0/model/channel/message/Message.java | 2 +- .../model/channel/message/MessageTrait.java | 2 +- .../model/channel/operation/Operation.java | 2 +- .../channel/operation/OperationTrait.java | 2 +- .../v2/_0_0/model/component/Components.java | 4 +- .../asyncapi/v2/_0_0/model/info/Contact.java | 2 +- .../com/asyncapi/v2/_0_0/model/info/Info.java | 2 +- .../asyncapi/v2/_0_0/model/info/License.java | 2 +- .../asyncapi/v2/_0_0/model/server/Server.java | 2 +- .../v2/_0_0/model/server/ServerVariable.java | 2 +- .../com/asyncapi/v2/_6_0/model/AsyncAPI.java | 2 +- .../v2/_6_0/model/ExternalDocumentation.java | 2 +- .../java/com/asyncapi/v2/_6_0/model/Tag.java | 2 +- .../v2/_6_0/model/channel/ChannelItem.java | 4 +- .../v2/_6_0/model/channel/Parameter.java | 2 +- .../model/channel/message/CorrelationId.java | 2 +- .../_6_0/model/channel/message/Message.java | 2 +- .../model/channel/message/MessageExample.java | 2 +- .../model/channel/message/MessageTrait.java | 2 +- .../model/channel/operation/Operation.java | 2 +- .../channel/operation/OperationTrait.java | 2 +- .../v2/_6_0/model/component/Components.java | 4 +- .../asyncapi/v2/_6_0/model/info/Contact.java | 2 +- .../com/asyncapi/v2/_6_0/model/info/Info.java | 2 +- .../asyncapi/v2/_6_0/model/info/License.java | 2 +- .../asyncapi/v2/_6_0/model/server/Server.java | 2 +- .../v2/_6_0/model/server/ServerVariable.java | 2 +- .../v2/binding/channel/ChannelBinding.java | 13 ------ .../channel/amqp/AMQPChannelBinding.java | 2 +- .../channel/amqp1/AMQP1ChannelBinding.java | 2 +- .../anypointmq/AnypointMQChannelBinding.java | 2 +- .../GooglePubSubChannelBinding.java | 2 +- .../channel/http/HTTPChannelBinding.java | 2 +- .../channel/ibmmq/IBMMQChannelBinding.java | 2 +- .../channel/jms/JMSChannelBinding.java | 2 +- .../channel/kafka/KafkaChannelBinding.java | 2 +- .../mercure/MercureChannelBinding.java | 2 +- .../channel/mqtt/MQTTChannelBinding.java | 2 +- .../channel/mqtt5/MQTT5ChannelBinding.java | 2 +- .../channel/nats/NATSChannelBinding.java | 2 +- .../channel/pulsar/PulsarChannelBinding.java | 2 +- .../channel/redis/RedisChannelBinding.java | 2 +- .../channel/sns/SNSChannelBinding.java | 2 +- .../channel/solace/SolaceChannelBinding.java | 2 +- .../channel/sqs/SQSChannelBinding.java | 2 +- .../channel/stomp/STOMPChannelBinding.java | 2 +- .../channel/ws/WebSocketsChannelBinding.java | 2 +- .../v2/binding/message/MessageBinding.java | 2 +- .../binding/operation/OperationBinding.java | 2 +- .../v2/binding/server/ServerBinding.java | 2 +- .../java/com/asyncapi/v2/schema/Schema.java | 2 +- .../v2/security_scheme/SecurityScheme.java | 2 +- .../v2/security_scheme/oauth2/OAuthFlows.java | 2 +- .../oauth2/flow/OAuthFlow.java | 2 +- .../com/asyncapi/v3/_0_0/model/AsyncAPI.java | 2 +- .../v3/_0_0/model/ExternalDocumentation.java | 2 +- .../java/com/asyncapi/v3/_0_0/model/Tag.java | 2 +- .../v3/_0_0/model/channel/Channel.java | 4 +- .../v3/_0_0/model/channel/Parameter.java | 2 +- .../model/channel/message/CorrelationId.java | 2 +- .../_0_0/model/channel/message/Message.java | 2 +- .../model/channel/message/MessageExample.java | 2 +- .../model/channel/message/MessageTrait.java | 2 +- .../v3/_0_0/model/component/Components.java | 4 +- .../asyncapi/v3/_0_0/model/info/Contact.java | 2 +- .../com/asyncapi/v3/_0_0/model/info/Info.java | 2 +- .../asyncapi/v3/_0_0/model/info/License.java | 2 +- .../v3/_0_0/model/operation/Operation.java | 2 +- .../_0_0/model/operation/OperationTrait.java | 2 +- .../model/operation/reply/OperationReply.java | 2 +- .../reply/OperationReplyAddress.java | 2 +- .../asyncapi/v3/_0_0/model/server/Server.java | 2 +- .../v3/_0_0/model/server/ServerVariable.java | 2 +- .../v3/binding/channel/ChannelBinding.java | 18 -------- .../channel/amqp/AMQPChannelBinding.java | 2 +- .../channel/amqp1/AMQP1ChannelBinding.java | 2 +- .../anypointmq/AnypointMQChannelBinding.java | 2 +- .../GooglePubSubChannelBinding.java | 2 +- .../channel/http/HTTPChannelBinding.java | 2 +- .../channel/ibmmq/IBMMQChannelBinding.java | 2 +- .../channel/jms/JMSChannelBinding.java | 2 +- .../channel/kafka/KafkaChannelBinding.java | 2 +- .../mercure/MercureChannelBinding.java | 2 +- .../channel/mqtt/MQTTChannelBinding.java | 2 +- .../channel/mqtt5/MQTT5ChannelBinding.java | 2 +- .../channel/nats/NATSChannelBinding.java | 2 +- .../channel/pulsar/PulsarChannelBinding.java | 2 +- .../channel/redis/RedisChannelBinding.java | 2 +- .../channel/sns/SNSChannelBinding.java | 2 +- .../channel/solace/SolaceChannelBinding.java | 2 +- .../channel/sqs/SQSChannelBinding.java | 2 +- .../channel/stomp/STOMPChannelBinding.java | 2 +- .../v3/binding/message/MessageBinding.java | 2 +- .../binding/operation/OperationBinding.java | 2 +- .../v3/binding/server/ServerBinding.java | 2 +- .../asyncapi/v3/schema/AsyncAPISchema.java | 2 +- .../schema/multiformat/MultiFormatSchema.java | 2 +- .../v3/security_scheme/SecurityScheme.java | 2 +- .../v3/security_scheme/oauth2/OAuthFlows.java | 2 +- .../flow/AuthorizationCodeOAuthFlow.java | 2 +- .../flow/ClientCredentialsOAuthFlow.java | 2 +- .../oauth2/flow/ImplicitOAuthFlow.java | 2 +- .../oauth2/flow/OAuthFlow.java | 2 +- .../oauth2/flow/PasswordOAuthFlow.java | 2 +- .../test/kotlin/com/asyncapi/v2/SerDeTest.kt | 1 + .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../test/kotlin/com/asyncapi/v3/SerDeTest.kt | 1 + 119 files changed, 122 insertions(+), 194 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3 => }/ExtendableObject.java (98%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/ExtendableObject.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ChannelBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/ExtendableObject.java b/asyncapi-core/src/main/java/com/asyncapi/ExtendableObject.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/ExtendableObject.java rename to asyncapi-core/src/main/java/com/asyncapi/ExtendableObject.java index f8bb988a..fc1555c5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/ExtendableObject.java +++ b/asyncapi-core/src/main/java/com/asyncapi/ExtendableObject.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3; +package com.asyncapi; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java index 06669e83..c15be28a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java index bd6aa60d..925b533c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java index f91c2cad..6f5c6583 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java index 456d8ef1..b1ab004a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/ExtendableObject.java b/asyncapi-core/src/main/java/com/asyncapi/v2/ExtendableObject.java deleted file mode 100644 index 534b4eb2..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/ExtendableObject.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.asyncapi.v2; - -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Pattern; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonIgnoreProperties({"extensionFields"}) -public class ExtendableObject { - - private static final Pattern extensionPropertyNamePattern = Pattern.compile("^x-[\\w\\d\\-\\_]+$"); - - /** - * Extension fields in the form x-extension-field-name for the exposed API. - */ - @Nullable - @JsonAnyGetter - protected Map extensionFields; - - @JsonAnySetter - protected final void readExtensionProperty(String name, Object value) { - if (extensionPropertyNamePattern.matcher(name).matches()) { - if (extensionFields == null) { - extensionFields = new HashMap<>(); - } - - extensionFields.put(name, value); - } else { - throw new IllegalArgumentException(String.format("\"%s\" is not valid extension property", name)); - } - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java index 790ef520..df3231a6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.model.channel.ChannelItem; import com.asyncapi.v2._0_0.model.component.Components; import com.asyncapi.v2._0_0.model.info.Info; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java index 271780a7..5e3ce1dc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java index 536a3d2a..8c51efeb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java index 369c4980..3e4a5a90 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java @@ -1,10 +1,10 @@ package com.asyncapi.v2._0_0.model.channel; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.ChannelParametersDeserializer; import com.asyncapi.v2.Reference; import com.asyncapi.v2._0_0.model.channel.operation.Operation; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java index 2b5e192f..99707c4f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2.schema.Schema; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java index 56f008a7..04ab445f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel.message; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java index 7f68d20b..7366f9c3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel.message; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessagePayloadDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java index a762936a..7919e077 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel.message; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java index 1a243f9d..bedb1427 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel.operation; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationMessageDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationTraitsDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java index d66d74e3..fdee6690 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel.operation; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.model.ExternalDocumentation; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java index c6f4660d..27a92012 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.component; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsMessagesDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsParametersDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsSchemasDeserializer; @@ -12,7 +12,7 @@ import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.schema.Schema; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v2.binding.message.MessageBinding; import com.asyncapi.v2.binding.operation.OperationBinding; import com.asyncapi.v2.binding.server.ServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java index 648c91da..7e5912f3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.info; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java index 61a5a338..560b41e9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.info; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java index dfb6c6c4..a11085be 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.info; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java index 4d707b5a..9702a0d0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.server; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2.binding.server.ServerBinding; import com.asyncapi.v2.jackson.binding.server.ServerBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java index 5b1d233c..4e54612b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.server; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java index 017409dd..c8106f81 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.jackson.model.server.ServersDeserializer; import com.asyncapi.v2._6_0.model.channel.ChannelItem; import com.asyncapi.v2._6_0.model.component.Components; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java index d9023f23..609c28f4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java index f441e6ab..a9c32846 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java index 57fcad88..863f123c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java @@ -1,9 +1,9 @@ package com.asyncapi.v2._6_0.model.channel; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.jackson.model.channel.ChannelParametersDeserializer; import com.asyncapi.v2._6_0.model.channel.operation.Operation; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java index e14cc2d9..04c449ee 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.jackson.model.schema.SchemaDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java index c88a7415..48af83a1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java index 6db494a8..9ea02654 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessagePayloadDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java index 9d461a0a..db267857 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java index e4fba669..44625e4c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java index 0a94bdb7..fc9ebe2e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.operation; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.jackson.model.channel.operation.OperationMessageDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.operation.OperationTraitsDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java index aee233b5..5c29cb89 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.operation; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.v2.binding.operation.OperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index 99b5ec1a..e060d5a1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.component; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsCorrelationIdsDeserializer; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsMessageTraitsDeserializer; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsMessagesDeserializer; @@ -11,7 +11,7 @@ import com.asyncapi.v2._6_0.jackson.model.component.ComponentsServerVariablesDeserializer; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsServersDeserializer; import com.asyncapi.v2._6_0.model.channel.ChannelItem; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v2.binding.message.MessageBinding; import com.asyncapi.v2.binding.operation.OperationBinding; import com.asyncapi.v2.binding.server.ServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java index 0967dc56..9279795b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.info; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java index 0d659fa6..585235e2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.info; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java index aa38568a..ad0f1b44 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.info; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java index 21e2ad1e..4c9fc5b5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.server; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.jackson.model.server.ServerVariablesDeserializer; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.v2.binding.server.ServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java index 368b7a0f..e59e72a8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.server; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ChannelBinding.java deleted file mode 100644 index 90d9c6fc..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ChannelBinding.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.asyncapi.v2.binding.channel; - -import com.asyncapi.v2.ExtendableObject; -import lombok.EqualsAndHashCode; - -/** - * Describes AsyncAPI channel binding. - * - * @author Pavel Bodiachevskii - */ -@EqualsAndHashCode(callSuper = true) -public class ChannelBinding extends ExtendableObject { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBinding.java index 616b92ba..7ba11be3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.amqp; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v2.binding.channel.amqp.exchange.AMQPChannelExchangeProperties; import com.asyncapi.v2.binding.channel.amqp.queue.AMQPChannelQueueProperties; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp1/AMQP1ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp1/AMQP1ChannelBinding.java index c214aa4a..b4c0e4a6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp1/AMQP1ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp1/AMQP1ChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.amqp1; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBinding.java index 790ef4c0..561ffb07 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.anypointmq; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBinding.java index 896a88b6..7a19e514 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.googlepubsub; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/http/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/http/HTTPChannelBinding.java index 11465c10..d1235b6b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/http/HTTPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/http/HTTPChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.http; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBinding.java index 47d14e4f..82cb4f43 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.ibmmq; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/jms/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/jms/JMSChannelBinding.java index f1fa217f..b69941e5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/jms/JMSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/jms/JMSChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.jms; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBinding.java index 2408566b..3ed799ce 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.kafka; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mercure/MercureChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mercure/MercureChannelBinding.java index d0c3703e..68bf5dc7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mercure/MercureChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mercure/MercureChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.mercure; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt/MQTTChannelBinding.java index ca180f07..1ea67bbc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt/MQTTChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt/MQTTChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.mqtt; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt5/MQTT5ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt5/MQTT5ChannelBinding.java index 6b073eae..21f39403 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt5/MQTT5ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt5/MQTT5ChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.mqtt5; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/nats/NATSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/nats/NATSChannelBinding.java index d8b53857..9ecece24 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/nats/NATSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/nats/NATSChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.nats; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBinding.java index 8c2e314b..98c147da 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.pulsar; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/redis/RedisChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/redis/RedisChannelBinding.java index 4edb073e..d926c3a4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/redis/RedisChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/redis/RedisChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.redis; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sns/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sns/SNSChannelBinding.java index 101d3629..9d3ee64b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sns/SNSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sns/SNSChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.sns; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/solace/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/solace/SolaceChannelBinding.java index 58ff56e2..c4020561 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/solace/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/solace/SolaceChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.solace; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sqs/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sqs/SQSChannelBinding.java index 8a23ba1c..d8f2ed4e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sqs/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sqs/SQSChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.sqs; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java index df9b5f31..1c4da346 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.stomp; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBinding.java index 4d8c66d7..b2845351 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.channel.ws; -import com.asyncapi.v2.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v2.schema.Schema; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/MessageBinding.java index ebe7e2ed..f86b39a2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/MessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/OperationBinding.java index 7b167eec..8cd502ad 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/OperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ServerBinding.java index ed0c727c..94bebafe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java b/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java index 42c71db3..9028b4bc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.schema; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.schema.SchemasAdditionalPropertiesDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; import com.asyncapi.v2.jackson.SchemaItemsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java index c250e778..c9035d15 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.security_scheme; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2.security_scheme.http.HttpApiKeySecurityScheme; import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme; import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java index 835b636f..08b7846d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.security_scheme.oauth2; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v2.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow; import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow; import com.asyncapi.v2.security_scheme.oauth2.flow.ImplicitOAuthFlow; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java index 27e63b29..d1953f5c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.security_scheme.oauth2.flow; -import com.asyncapi.v2.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java index 80e68798..cca08fc8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.channel.ChannelsDeserializer; import com.asyncapi.v3._0_0.jackson.model.operation.OperationsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java index 55b14b20..302f6d13 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java index 7b77f09c..a47a6007 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java index 8c93f831..993baec0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; @@ -9,7 +9,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3._0_0.model.channel.message.Message; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v3.jackson.binding.channel.ChannelBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java index 2196d2e2..fa662d13 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java index b7bfea89..807575ce 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java index e739eece..62e317c5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java index 6593ff02..9d068dd4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java index a9199d62..40ccac6f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index 9f56b473..85e57105 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -15,7 +15,7 @@ import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress; import com.asyncapi.v3._0_0.model.server.Server; import com.asyncapi.v3._0_0.model.server.ServerVariable; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v3.binding.message.MessageBinding; import com.asyncapi.v3.binding.operation.OperationBinding; import com.asyncapi.v3.binding.server.ServerBinding; @@ -26,7 +26,7 @@ import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.v3.security_scheme.SecurityScheme; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java index bd2af1b2..8781e461 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java index b9a131c3..71f547e0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java @@ -5,7 +5,7 @@ import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java index 415dd90b..bd9faeca 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java index 81310044..ca8ffee2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java index 8ea88346..1da77897 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java index 1b90ba66..65e636a1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation.reply; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.operation.reply.OperationReplyAddressDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java index 8a9875ba..342ec12b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation.reply; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java index 8d38cd89..d6615fd5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java @@ -3,7 +3,7 @@ import com.asyncapi.v3.jackson.binding.server.ServerBindingsDeserializer; import com.asyncapi.v3._0_0.jackson.model.server.ServerVariablesDeserializer; import com.asyncapi.v3.binding.server.ServerBinding; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java index 87f852e1..b41906c3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.server; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ChannelBinding.java deleted file mode 100644 index 825bc97b..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ChannelBinding.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.asyncapi.v3.binding.channel; - -import com.asyncapi.v3.ExtendableObject; -import lombok.EqualsAndHashCode; - -/** - * Describes protocol-specific definition for a channel. - *

- * This object MAY be extended with {@link ExtendableObject}. - * - * @see Specification Extensions - * @see Channel Binding - * @author Pavel Bodiachevskii - * @version 3.0.0 - */ -@EqualsAndHashCode(callSuper = true) -public class ChannelBinding extends ExtendableObject { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBinding.java index bed4fa16..6ae326b6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.amqp; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v3.binding.channel.amqp.exchange.AMQPChannelExchangeProperties; import com.asyncapi.v3.binding.channel.amqp.queue.AMQPChannelQueueProperties; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp1/AMQP1ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp1/AMQP1ChannelBinding.java index b9d5b157..b3742e68 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp1/AMQP1ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp1/AMQP1ChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.amqp1; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBinding.java index 84c63a06..1835f6af 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.anypointmq; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBinding.java index 1f93f6c2..3627e2c8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.googlepubsub; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/http/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/http/HTTPChannelBinding.java index 3419cdc2..7a62e532 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/http/HTTPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/http/HTTPChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.http; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBinding.java index bb637b2a..8db81af6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.ibmmq; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/jms/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/jms/JMSChannelBinding.java index 3d74dac6..528e5fd4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/jms/JMSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/jms/JMSChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.jms; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBinding.java index 66b61ea5..a0eb4170 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.kafka; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mercure/MercureChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mercure/MercureChannelBinding.java index 8cdb274b..eec421c9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mercure/MercureChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mercure/MercureChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.mercure; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt/MQTTChannelBinding.java index 8f1ad80b..1c5f6ca9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt/MQTTChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt/MQTTChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.mqtt; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt5/MQTT5ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt5/MQTT5ChannelBinding.java index 6386770b..a64d31e5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt5/MQTT5ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt5/MQTT5ChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.mqtt5; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/nats/NATSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/nats/NATSChannelBinding.java index c069aabe..67c7f08e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/nats/NATSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/nats/NATSChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.nats; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBinding.java index df114f94..5d2c904b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.pulsar; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/redis/RedisChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/redis/RedisChannelBinding.java index a061a679..e709a190 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/redis/RedisChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/redis/RedisChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.redis; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sns/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sns/SNSChannelBinding.java index f2e8b833..16d526f0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sns/SNSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sns/SNSChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.sns; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/solace/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/solace/SolaceChannelBinding.java index cbd31a55..4589b709 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/solace/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/solace/SolaceChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.solace; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sqs/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sqs/SQSChannelBinding.java index 961a8ad6..fb48e64c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sqs/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sqs/SQSChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.sqs; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java index f4b13a98..8064d557 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.channel.stomp; -import com.asyncapi.v3.binding.channel.ChannelBinding; +import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/MessageBinding.java index 2f75d7d8..6ca5d2c9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/MessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/OperationBinding.java index c055ade8..afa1cf38 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/OperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ServerBinding.java index d4c58f0e..3f99f480 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.EqualsAndHashCode; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java index 888b5994..259a7813 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAdditionalPropertiesDeserializer; import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAnyValueDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java index f8aab37b..b26840d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java index ce6a57a3..706f2289 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.security_scheme; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.security_scheme.http.HttpApiKeySecurityScheme; import com.asyncapi.v3.security_scheme.http.HttpSecurityScheme; import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java index 00f2c8ee..fbb41f7e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import com.asyncapi.v3.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow; import com.asyncapi.v3.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow; import com.asyncapi.v3.security_scheme.oauth2.flow.ImplicitOAuthFlow; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java index bb0159eb..c9bb1d6a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java @@ -9,7 +9,7 @@ /** * Configuration for the OAuth Authorization Code flow *

- * This object MAY be extended with {@link com.asyncapi.v3.ExtendableObject}. + * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. * * @see OAuth Flow * @see Specification Extensions diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java index 2f603fae..660138e0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -9,7 +9,7 @@ /** * Configuration for the OAuth Client Credentials flow *

- * This object MAY be extended with {@link com.asyncapi.v3.ExtendableObject}. + * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. * * @see OAuth Flow * @see Specification Extensions diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java index 6c71d7a0..dc32c38c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java @@ -9,7 +9,7 @@ /** * Configuration for the OAuth Implicit flow *

- * This object MAY be extended with {@link com.asyncapi.v3.ExtendableObject}. + * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. * * @see OAuth Flow * @see Specification Extensions diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java index 4751cc35..1f63c1bb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow; -import com.asyncapi.v3.ExtendableObject; +import com.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java index 6b79f539..838ef794 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java @@ -9,7 +9,7 @@ /** * Configuration for the OAuth Resource Owner Protected Credentials flow *

- * This object MAY be extended with {@link com.asyncapi.v3.ExtendableObject}. + * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. * * @see OAuth Flow * @see Specification Extensions diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt index 02ae2076..05c3f074 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v2 +import com.asyncapi.ExtendableObject import com.fasterxml.jackson.databind.JsonMappingException import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 64d42f9a..bd2f4379 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._0_0.model.channel.operation.OperationWithReferenceToMessageTest import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.binding.channel.ChannelBinding +import com.asyncapi.bindings.ChannelBinding import com.asyncapi.v2.binding.channel.amqp.AMQPChannelBindingTest import com.asyncapi.v2.binding.channel.amqp1.AMQP1ChannelBinding import com.asyncapi.v2.binding.channel.anypointmq.AnypointMQChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt index 45ccc185..14d83376 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3 +import com.asyncapi.ExtendableObject import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.JsonMappingException import com.fasterxml.jackson.databind.ObjectMapper From a031105762452d5e743056c3cc231561c08b93a2 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 17:24:25 +0400 Subject: [PATCH 004/141] feat(bindings): use common MessageBinding https://github.com/asyncapi/jasyncapi/issues/184 --- .../v0/_1_0/message/WebSocketsMessageBinding.java | 2 +- .../v2/_0_0/model/channel/message/Message.java | 2 +- .../v2/_0_0/model/channel/message/MessageTrait.java | 2 +- .../v2/_0_0/model/component/Components.java | 2 +- .../v2/_6_0/model/channel/message/Message.java | 2 +- .../v2/_6_0/model/channel/message/MessageTrait.java | 2 +- .../v2/_6_0/model/component/Components.java | 2 +- .../asyncapi/v2/binding/message/MessageBinding.java | 13 ------------- .../v2/binding/message/amqp/AMQPMessageBinding.java | 2 +- .../binding/message/amqp1/AMQP1MessageBinding.java | 2 +- .../anypointmq/AnypointMQMessageBinding.java | 2 +- .../googlepubsub/GooglePubSubMessageBinding.java | 2 +- .../v2/binding/message/http/HTTPMessageBinding.java | 2 +- .../binding/message/ibmmq/IBMMQMessageBinding.java | 2 +- .../v2/binding/message/jms/JMSMessageBinding.java | 2 +- .../binding/message/kafka/KafkaMessageBinding.java | 2 +- .../message/mercure/MercureMessageBinding.java | 2 +- .../v2/binding/message/mqtt/MQTTMessageBinding.java | 2 +- .../binding/message/mqtt5/MQTT5MessageBinding.java | 2 +- .../v2/binding/message/nats/NATSMessageBinding.java | 2 +- .../message/pulsar/PulsarMessageBinding.java | 2 +- .../binding/message/redis/RedisMessageBinding.java | 2 +- .../v2/binding/message/sns/SNSMessageBinding.java | 2 +- .../message/solace/SolaceMessageBinding.java | 2 +- .../v2/binding/message/sqs/SQSMessageBinding.java | 2 +- .../binding/message/stomp/STOMPMessageBinding.java | 2 +- .../message/ws/WebSocketsMessageBinding.java | 2 +- .../v3/_0_0/model/channel/message/Message.java | 2 +- .../v3/_0_0/model/channel/message/MessageTrait.java | 2 +- .../v3/_0_0/model/component/Components.java | 2 +- .../asyncapi/v3/binding/message/MessageBinding.java | 13 ------------- .../v3/binding/message/amqp/AMQPMessageBinding.java | 2 +- .../binding/message/amqp1/AMQP1MessageBinding.java | 2 +- .../anypointmq/AnypointMQMessageBinding.java | 2 +- .../googlepubsub/GooglePubSubMessageBinding.java | 2 +- .../v3/binding/message/http/HTTPMessageBinding.java | 2 +- .../binding/message/ibmmq/IBMMQMessageBinding.java | 2 +- .../v3/binding/message/jms/JMSMessageBinding.java | 2 +- .../binding/message/kafka/KafkaMessageBinding.java | 2 +- .../message/mercure/MercureMessageBinding.java | 2 +- .../v3/binding/message/mqtt/MQTTMessageBinding.java | 2 +- .../binding/message/mqtt5/MQTT5MessageBinding.java | 2 +- .../v3/binding/message/nats/NATSMessageBinding.java | 2 +- .../message/pulsar/PulsarMessageBinding.java | 2 +- .../binding/message/redis/RedisMessageBinding.java | 2 +- .../v3/binding/message/sns/SNSMessageBinding.java | 2 +- .../message/solace/SolaceMessageBinding.java | 2 +- .../v3/binding/message/sqs/SQSMessageBinding.java | 2 +- .../binding/message/stomp/STOMPMessageBinding.java | 2 +- .../v2/_0_0/model/channel/message/MessageTest.kt | 2 +- 50 files changed, 48 insertions(+), 74 deletions(-) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/MessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/MessageBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java index 2062506e..9ef209c4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.websockets.v0._1_0.message; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java index 7366f9c3..cc05b578 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java @@ -9,7 +9,7 @@ import com.asyncapi.v2.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2.schema.Schema; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java index 7919e077..d7553972 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java @@ -8,7 +8,7 @@ import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.schema.Schema; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java index 27a92012..437423f3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java @@ -13,7 +13,7 @@ import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.schema.Schema; import com.asyncapi.bindings.ChannelBinding; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v2.binding.operation.OperationBinding; import com.asyncapi.v2.binding.server.ServerBinding; import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java index 9ea02654..203c7627 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageTraitsDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java index 44625e4c..e669078b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java @@ -5,7 +5,7 @@ import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index e060d5a1..0e44302e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -12,7 +12,7 @@ import com.asyncapi.v2._6_0.jackson.model.component.ComponentsServersDeserializer; import com.asyncapi.v2._6_0.model.channel.ChannelItem; import com.asyncapi.bindings.ChannelBinding; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v2.binding.operation.OperationBinding; import com.asyncapi.v2.binding.server.ServerBinding; import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/MessageBinding.java deleted file mode 100644 index f86b39a2..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/MessageBinding.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.asyncapi.v2.binding.message; - -import com.asyncapi.ExtendableObject; -import lombok.EqualsAndHashCode; - -/** - * Describes AsyncAPI message binding. - * - * @author Pavel Bodiachevskii - */ -@EqualsAndHashCode(callSuper = true) -public class MessageBinding extends ExtendableObject { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp/AMQPMessageBinding.java index d2281e2b..879bc956 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp/AMQPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.amqp; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp1/AMQP1MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp1/AMQP1MessageBinding.java index 5ef4bbaa..f71badf4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp1/AMQP1MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp1/AMQP1MessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.amqp1; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBinding.java index d424ee88..693ca604 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.anypointmq; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v2.schema.Schema; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBinding.java index 3f1771cc..d0ad072b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.googlepubsub; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/http/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/http/HTTPMessageBinding.java index 863d2546..52c5f2e2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/http/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/http/HTTPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.http; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v2.schema.Schema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBinding.java index 1b233d53..6839c4fe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.ibmmq; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/jms/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/jms/JMSMessageBinding.java index 46d271ad..b0912337 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/jms/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/jms/JMSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.jms; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageBinding.java index e7728c9d..ff01459d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.kafka; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v2.schema.Schema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mercure/MercureMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mercure/MercureMessageBinding.java index 0bbe57b1..f0520f76 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mercure/MercureMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mercure/MercureMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.mercure; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBinding.java index c08ece8f..8f0be837 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.mqtt; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt5/MQTT5MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt5/MQTT5MessageBinding.java index 9b850e40..f1409b2f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt5/MQTT5MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt5/MQTT5MessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.mqtt5; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/nats/NATSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/nats/NATSMessageBinding.java index d1d75520..d8cb8506 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/nats/NATSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/nats/NATSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.nats; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/pulsar/PulsarMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/pulsar/PulsarMessageBinding.java index 909994a2..94048dd8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/pulsar/PulsarMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/pulsar/PulsarMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.pulsar; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/redis/RedisMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/redis/RedisMessageBinding.java index 8218be2d..36daa1f7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/redis/RedisMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/redis/RedisMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.redis; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sns/SNSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sns/SNSMessageBinding.java index d20c2d12..f6c66b7e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sns/SNSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sns/SNSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.sns; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/solace/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/solace/SolaceMessageBinding.java index 3da3d1d5..0ad1ca75 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/solace/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/solace/SolaceMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.solace; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sqs/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sqs/SQSMessageBinding.java index 5ed5ea51..79c89bc3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sqs/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sqs/SQSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.sqs; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java index e6428f0d..ac314af9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.stomp; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java index 61582b36..8373c2d1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.message.ws; -import com.asyncapi.v2.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java index 62e317c5..a5bf1b0c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java @@ -123,7 +123,7 @@ public class Message extends ExtendableObject { *

* MUST BE: *

*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java index 40ccac6f..b78249dc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java @@ -106,7 +106,7 @@ public class MessageTrait extends ExtendableObject { *

* MUST BE: *

*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index 85e57105..c4fcf403 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -16,7 +16,7 @@ import com.asyncapi.v3._0_0.model.server.Server; import com.asyncapi.v3._0_0.model.server.ServerVariable; import com.asyncapi.bindings.ChannelBinding; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v3.binding.operation.OperationBinding; import com.asyncapi.v3.binding.server.ServerBinding; import com.asyncapi.v3.jackson.binding.channel.ChannelBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/MessageBinding.java deleted file mode 100644 index 6ca5d2c9..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/MessageBinding.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.asyncapi.v3.binding.message; - -import com.asyncapi.ExtendableObject; -import lombok.EqualsAndHashCode; - -/** - * Describes AsyncAPI message binding. - * - * @author Pavel Bodiachevskii - */ -@EqualsAndHashCode(callSuper = true) -public class MessageBinding extends ExtendableObject { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp/AMQPMessageBinding.java index 820202c6..522d4d7f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp/AMQPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.amqp; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp1/AMQP1MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp1/AMQP1MessageBinding.java index 73617ca1..5c497ea3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp1/AMQP1MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp1/AMQP1MessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.amqp1; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBinding.java index 202a7529..e7a69598 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBinding.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.binding.message.anypointmq; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBinding.java index 5f6373de..e55a7abc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.googlepubsub; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/http/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/http/HTTPMessageBinding.java index b96aa576..04026bc4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/http/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/http/HTTPMessageBinding.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.binding.message.http; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBinding.java index 72efcf1a..2dd7723d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.ibmmq; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/jms/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/jms/JMSMessageBinding.java index f44eec50..4c9a0f59 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/jms/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/jms/JMSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.jms; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageBinding.java index d7a06825..d7e9522a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageBinding.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.binding.message.kafka; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mercure/MercureMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mercure/MercureMessageBinding.java index aa3ead1c..841dc992 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mercure/MercureMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mercure/MercureMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.mercure; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBinding.java index cbaa824d..bcb3ea70 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.mqtt; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt5/MQTT5MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt5/MQTT5MessageBinding.java index e344426e..8a235e0f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt5/MQTT5MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt5/MQTT5MessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.mqtt5; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/nats/NATSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/nats/NATSMessageBinding.java index 8557fc15..b6c24fde 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/nats/NATSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/nats/NATSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.nats; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/pulsar/PulsarMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/pulsar/PulsarMessageBinding.java index 257d9948..52a9ee14 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/pulsar/PulsarMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/pulsar/PulsarMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.pulsar; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/redis/RedisMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/redis/RedisMessageBinding.java index 37b5980a..9001766c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/redis/RedisMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/redis/RedisMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.redis; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sns/SNSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sns/SNSMessageBinding.java index 17a72455..f3e9cab2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sns/SNSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sns/SNSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.sns; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/solace/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/solace/SolaceMessageBinding.java index 29b24c2b..27b9216e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/solace/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/solace/SolaceMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.solace; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sqs/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sqs/SQSMessageBinding.java index 9defa798..919286c9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sqs/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sqs/SQSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.sqs; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java index 3e786247..a3052965 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.message.stomp; -import com.asyncapi.v3.binding.message.MessageBinding; +import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index bf0043dd..076377d5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.binding.message.MessageBinding +import com.asyncapi.bindings.MessageBinding import com.asyncapi.v2.binding.message.amqp.AMQPMessageBindingTest import com.asyncapi.v2.binding.message.amqp1.AMQP1MessageBinding import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest From 5c8f7ac65b152fe8f7e31def7c8a91860600539e Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 17:26:31 +0400 Subject: [PATCH 005/141] feat(bindings): use common OperationBinding https://github.com/asyncapi/jasyncapi/issues/184 --- .../model/channel/operation/Operation.java | 2 +- .../channel/operation/OperationTrait.java | 2 +- .../v2/_0_0/model/component/Components.java | 2 +- .../model/channel/operation/Operation.java | 2 +- .../channel/operation/OperationTrait.java | 2 +- .../v2/_6_0/model/component/Components.java | 2 +- .../v2/binding/operation/OperationBinding.java | 13 ------------- .../operation/amqp/AMQPOperationBinding.java | 2 +- .../operation/amqp1/AMQP1OperationBinding.java | 2 +- .../anypointmq/AnypointMQOperationBinding.java | 2 +- .../GooglePubSubOperationBinding.java | 2 +- .../operation/http/HTTPOperationBinding.java | 2 +- .../operation/ibmmq/IBMMQOperationBinding.java | 2 +- .../operation/jms/JMSOperationBinding.java | 2 +- .../operation/kafka/KafkaOperationBinding.java | 2 +- .../mercure/MercureOperationBinding.java | 2 +- .../operation/mqtt/MQTTOperationBinding.java | 2 +- .../operation/mqtt5/MQTT5OperationBinding.java | 2 +- .../operation/nats/NATSOperationBinding.java | 2 +- .../pulsar/PulsarOperationBinding.java | 2 +- .../operation/redis/RedisOperationBinding.java | 2 +- .../operation/sns/SNSOperationBinding.java | 2 +- .../solace/SolaceOperationBinding.java | 2 +- .../operation/sqs/SQSOperationBinding.java | 2 +- .../operation/stomp/STOMPOperationBinding.java | 2 +- .../ws/WebSocketsOperationBinding.java | 2 +- .../v3/_0_0/model/component/Components.java | 2 +- .../v3/_0_0/model/operation/Operation.java | 2 +- .../_0_0/model/operation/OperationTrait.java | 2 +- .../v3/binding/operation/OperationBinding.java | 18 ------------------ .../operation/amqp/AMQPOperationBinding.java | 2 +- .../operation/amqp1/AMQP1OperationBinding.java | 2 +- .../anypointmq/AnypointMQOperationBinding.java | 2 +- .../GooglePubSubOperationBinding.java | 2 +- .../operation/http/HTTPOperationBinding.java | 2 +- .../operation/ibmmq/IBMMQOperationBinding.java | 2 +- .../operation/jms/JMSOperationBinding.java | 2 +- .../operation/kafka/KafkaOperationBinding.java | 2 +- .../mercure/MercureOperationBinding.java | 2 +- .../operation/mqtt/MQTTOperationBinding.java | 2 +- .../operation/mqtt5/MQTT5OperationBinding.java | 2 +- .../operation/nats/NATSOperationBinding.java | 2 +- .../pulsar/PulsarOperationBinding.java | 2 +- .../operation/redis/RedisOperationBinding.java | 2 +- .../operation/sns/SNSOperationBinding.java | 2 +- .../solace/SolaceOperationBinding.java | 2 +- .../operation/sqs/SQSOperationBinding.java | 2 +- .../operation/stomp/STOMPOperationBinding.java | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- 49 files changed, 47 insertions(+), 78 deletions(-) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/OperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/OperationBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java index bedb1427..c6d1afc5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java @@ -7,7 +7,7 @@ import com.asyncapi.v2.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.message.Message; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java index fdee6690..73326976 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java @@ -4,7 +4,7 @@ import com.asyncapi.v2._0_0.model.ExternalDocumentation; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java index 437423f3..c6348830 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java @@ -14,7 +14,7 @@ import com.asyncapi.v2.schema.Schema; import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v2.binding.server.ServerBinding; import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java index fc9ebe2e..e1eb3a4b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java @@ -5,7 +5,7 @@ import com.asyncapi.v2._6_0.jackson.model.channel.operation.OperationTraitsDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java index 5c29cb89..8c87ae76 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java @@ -3,7 +3,7 @@ import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index 0e44302e..7a415243 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -13,7 +13,7 @@ import com.asyncapi.v2._6_0.model.channel.ChannelItem; import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v2.binding.server.ServerBinding; import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/OperationBinding.java deleted file mode 100644 index 8cd502ad..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/OperationBinding.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.asyncapi.v2.binding.operation; - -import com.asyncapi.ExtendableObject; -import lombok.EqualsAndHashCode; - -/** - * Describes AsyncAPI operation binding. - * - * @author Pavel Bodiachevskii - */ -@EqualsAndHashCode(callSuper = true) -public class OperationBinding extends ExtendableObject { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBinding.java index 034337ae..90658e35 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.amqp; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp1/AMQP1OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp1/AMQP1OperationBinding.java index f92e1e29..9367cebb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp1/AMQP1OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp1/AMQP1OperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.amqp1; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/anypointmq/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/anypointmq/AnypointMQOperationBinding.java index c2f2fb18..16329ba8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/anypointmq/AnypointMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/anypointmq/AnypointMQOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.anypointmq; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/googlepubsub/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/googlepubsub/GooglePubSubOperationBinding.java index 69727478..3e9c9bbe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/googlepubsub/GooglePubSubOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/googlepubsub/GooglePubSubOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.googlepubsub; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationBinding.java index 50de41dd..4b11498c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.http; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v2.schema.Schema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ibmmq/IBMMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ibmmq/IBMMQOperationBinding.java index e974652a..c0f78c53 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ibmmq/IBMMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ibmmq/IBMMQOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.ibmmq; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/jms/JMSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/jms/JMSOperationBinding.java index 20c32de1..aa3fd27a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/jms/JMSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/jms/JMSOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.jms; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBinding.java index 8ca426d2..77e08058 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.kafka; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v2.schema.Schema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mercure/MercureOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mercure/MercureOperationBinding.java index 0161bd0c..a62bd342 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mercure/MercureOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mercure/MercureOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.mercure; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBinding.java index d76d9d86..c58f69a4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.mqtt; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt5/MQTT5OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt5/MQTT5OperationBinding.java index 1d804a44..659df771 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt5/MQTT5OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt5/MQTT5OperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.mqtt5; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/nats/NATSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/nats/NATSOperationBinding.java index 6a82e9e6..379db0bb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/nats/NATSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/nats/NATSOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.nats; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/pulsar/PulsarOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/pulsar/PulsarOperationBinding.java index 4401701e..b5a7242b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/pulsar/PulsarOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/pulsar/PulsarOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.pulsar; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/redis/RedisOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/redis/RedisOperationBinding.java index a48e021a..8f1a2622 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/redis/RedisOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/redis/RedisOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.redis; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sns/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sns/SNSOperationBinding.java index c066056a..62606353 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sns/SNSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sns/SNSOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.sns; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationBinding.java index ff0a4ef7..a322976c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.solace; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sqs/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sqs/SQSOperationBinding.java index e527e551..697886f7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sqs/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sqs/SQSOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.sqs; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java index db615991..75cbee65 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.stomp; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java index bba61517..bfc3adbf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.operation.ws; -import com.asyncapi.v2.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index c4fcf403..1a0dfe52 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -17,7 +17,7 @@ import com.asyncapi.v3._0_0.model.server.ServerVariable; import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v3.binding.server.ServerBinding; import com.asyncapi.v3.jackson.binding.channel.ChannelBindingsDeserializer; import com.asyncapi.v3.jackson.binding.message.MessageBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java index ca8ffee2..947573a0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java @@ -9,7 +9,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v3.jackson.binding.operation.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; import com.asyncapi.v3.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java index 1da77897..05aafdaf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java @@ -8,7 +8,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v3.jackson.binding.operation.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; import com.asyncapi.v3.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/OperationBinding.java deleted file mode 100644 index afa1cf38..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/OperationBinding.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.asyncapi.v3.binding.operation; - -import com.asyncapi.ExtendableObject; -import lombok.EqualsAndHashCode; - -/** - * Describes protocol-specific definition for an operation. - *

- * This object MAY be extended with {@link ExtendableObject}. - * - * @see Specification Extensions - * @see Operation Binding - * @author Pavel Bodiachevskii - * @version 3.0.0 - */ -@EqualsAndHashCode(callSuper = true) -public class OperationBinding extends ExtendableObject { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBinding.java index 56d53677..b0366cda 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.amqp; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp1/AMQP1OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp1/AMQP1OperationBinding.java index 29a7ce02..b3d32834 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp1/AMQP1OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp1/AMQP1OperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.amqp1; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/anypointmq/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/anypointmq/AnypointMQOperationBinding.java index 8555af46..f4355eba 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/anypointmq/AnypointMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/anypointmq/AnypointMQOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.anypointmq; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/googlepubsub/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/googlepubsub/GooglePubSubOperationBinding.java index 7b074d70..df00b9fc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/googlepubsub/GooglePubSubOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/googlepubsub/GooglePubSubOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.googlepubsub; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationBinding.java index 0e272299..cad52b85 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationBinding.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.binding.operation.http; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ibmmq/IBMMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ibmmq/IBMMQOperationBinding.java index 0313e97f..34bd52c3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ibmmq/IBMMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ibmmq/IBMMQOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.ibmmq; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/jms/JMSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/jms/JMSOperationBinding.java index f3a1f1a8..9933d531 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/jms/JMSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/jms/JMSOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.jms; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBinding.java index 5ec025d1..8eee6301 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBinding.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.binding.operation.kafka; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mercure/MercureOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mercure/MercureOperationBinding.java index 10dcaa96..b77585d3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mercure/MercureOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mercure/MercureOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.mercure; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBinding.java index c9f36c7c..1274619b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.mqtt; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt5/MQTT5OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt5/MQTT5OperationBinding.java index 2964aad6..5306ea2e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt5/MQTT5OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt5/MQTT5OperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.mqtt5; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/nats/NATSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/nats/NATSOperationBinding.java index 9a6c2cf2..a29cc10d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/nats/NATSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/nats/NATSOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.nats; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/pulsar/PulsarOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/pulsar/PulsarOperationBinding.java index 3670d242..576987ca 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/pulsar/PulsarOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/pulsar/PulsarOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.pulsar; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/redis/RedisOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/redis/RedisOperationBinding.java index 0c4eb8e0..fde48293 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/redis/RedisOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/redis/RedisOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.redis; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sns/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sns/SNSOperationBinding.java index e0445fc8..fac389a9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sns/SNSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sns/SNSOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.sns; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationBinding.java index bd87d8a7..23c3080c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.solace; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sqs/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sqs/SQSOperationBinding.java index de34599b..28028bd2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sqs/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sqs/SQSOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.sqs; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java index 5679be40..d5246c3e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.operation.stomp; -import com.asyncapi.v3.binding.operation.OperationBinding; +import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 470e1b24..d5ee5f54 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.message.MessageTest -import com.asyncapi.v2.binding.operation.OperationBinding +import com.asyncapi.bindings.OperationBinding import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBindingTest import com.asyncapi.v2.binding.operation.amqp1.AMQP1OperationBinding import com.asyncapi.v2.binding.operation.anypointmq.AnypointMQOperationBinding From e277f02a50a4390decbdb45e660330b7db01cf72 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 17:28:15 +0400 Subject: [PATCH 006/141] feat(bindings): use common ServerBinding https://github.com/asyncapi/jasyncapi/issues/184 --- .../v2/_0_0/model/component/Components.java | 2 +- .../asyncapi/v2/_0_0/model/server/Server.java | 2 +- .../v2/_6_0/model/component/Components.java | 2 +- .../asyncapi/v2/_6_0/model/server/Server.java | 2 +- .../v2/binding/server/ServerBinding.java | 14 -------------- .../binding/server/amqp/AMQPServerBinding.java | 2 +- .../server/amqp1/AMQP1ServerBinding.java | 2 +- .../anypointmq/AnypointMQServerBinding.java | 2 +- .../GooglePubSubServerBinding.java | 2 +- .../binding/server/http/HTTPServerBinding.java | 2 +- .../server/ibmmq/IBMMQServerBinding.java | 2 +- .../binding/server/jms/JMSServerBinding.java | 2 +- .../server/kafka/KafkaServerBinding.java | 2 +- .../server/mercure/MercureServerBinding.java | 2 +- .../binding/server/mqtt/MQTTServerBinding.java | 2 +- .../server/mqtt5/MQTT5ServerBinding.java | 2 +- .../binding/server/nats/NATSServerBinding.java | 2 +- .../server/pulsar/PulsarServerBinding.java | 2 +- .../server/redis/RedisServerBinding.java | 2 +- .../binding/server/sns/SNSServerBinding.java | 2 +- .../server/solace/SolaceServerBinding.java | 2 +- .../binding/server/sqs/SQSServerBinding.java | 2 +- .../server/stomp/STOMPServerBinding.java | 2 +- .../server/ws/WebSocketsServerBinding.java | 2 +- .../v3/_0_0/model/component/Components.java | 2 +- .../asyncapi/v3/_0_0/model/server/Server.java | 2 +- .../v3/binding/server/ServerBinding.java | 18 ------------------ .../binding/server/amqp/AMQPServerBinding.java | 2 +- .../server/amqp1/AMQP1ServerBinding.java | 2 +- .../anypointmq/AnypointMQServerBinding.java | 2 +- .../GooglePubSubServerBinding.java | 2 +- .../binding/server/http/HTTPServerBinding.java | 2 +- .../server/ibmmq/IBMMQServerBinding.java | 2 +- .../binding/server/jms/JMSServerBinding.java | 2 +- .../server/kafka/KafkaServerBinding.java | 2 +- .../server/mercure/MercureServerBinding.java | 2 +- .../binding/server/mqtt/MQTTServerBinding.java | 2 +- .../server/mqtt5/MQTT5ServerBinding.java | 2 +- .../binding/server/nats/NATSServerBinding.java | 2 +- .../server/pulsar/PulsarServerBinding.java | 2 +- .../server/redis/RedisServerBinding.java | 2 +- .../binding/server/sns/SNSServerBinding.java | 2 +- .../server/solace/SolaceServerBinding.java | 2 +- .../binding/server/sqs/SQSServerBinding.java | 2 +- .../server/stomp/STOMPServerBinding.java | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- 46 files changed, 44 insertions(+), 76 deletions(-) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ServerBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java index c6348830..5b8e458c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java @@ -15,7 +15,7 @@ import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java index 9702a0d0..d1ad9e85 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model.server; import com.asyncapi.ExtendableObject; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.asyncapi.v2.jackson.binding.server.ServerBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index 7a415243..d6060da1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -14,7 +14,7 @@ import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java index 4c9fc5b5..4d9f4c65 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java @@ -3,7 +3,7 @@ import com.asyncapi.ExtendableObject; import com.asyncapi.v2._6_0.jackson.model.server.ServerVariablesDeserializer; import com.asyncapi.v2._6_0.model.Tag; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.asyncapi.v2.jackson.binding.server.ServerBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ServerBinding.java deleted file mode 100644 index 94bebafe..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ServerBinding.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.asyncapi.v2.binding.server; - -import com.asyncapi.ExtendableObject; -import lombok.EqualsAndHashCode; - -/** - * Describes AsyncAPI server binding. - * - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -@EqualsAndHashCode(callSuper = true) -public class ServerBinding extends ExtendableObject { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp/AMQPServerBinding.java index 78523a63..1b373041 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp/AMQPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp/AMQPServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.amqp; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp1/AMQP1ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp1/AMQP1ServerBinding.java index 661759c1..3b870fef 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp1/AMQP1ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp1/AMQP1ServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.amqp1; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/anypointmq/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/anypointmq/AnypointMQServerBinding.java index 08ec2b17..e0bed3c4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/anypointmq/AnypointMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/anypointmq/AnypointMQServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.anypointmq; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/googlepubsub/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/googlepubsub/GooglePubSubServerBinding.java index 56ffd92a..b0315ced 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/googlepubsub/GooglePubSubServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/googlepubsub/GooglePubSubServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.googlepubsub; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/http/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/http/HTTPServerBinding.java index 091ac279..fb9370ee 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/http/HTTPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/http/HTTPServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.http; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBinding.java index fdeef6d9..2ce00e3c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.ibmmq; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/jms/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/jms/JMSServerBinding.java index f205f22a..ed9d2ba4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/jms/JMSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/jms/JMSServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.jms; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/kafka/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/kafka/KafkaServerBinding.java index 87f21cec..0e7c02db 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/kafka/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/kafka/KafkaServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.kafka; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mercure/MercureServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mercure/MercureServerBinding.java index 4941376b..16298ce0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mercure/MercureServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mercure/MercureServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.mercure; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerBinding.java index b60dacb7..b574f05c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.mqtt; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBinding.java index d2bf748f..3e380f90 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.mqtt5; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/nats/NATSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/nats/NATSServerBinding.java index 913b1fb4..8a8ffa28 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/nats/NATSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/nats/NATSServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.nats; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/pulsar/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/pulsar/PulsarServerBinding.java index 1e6edea8..e664332d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/pulsar/PulsarServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/pulsar/PulsarServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.pulsar; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/redis/RedisServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/redis/RedisServerBinding.java index ba4018c7..6ee75959 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/redis/RedisServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/redis/RedisServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.redis; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sns/SNSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sns/SNSServerBinding.java index 15fbfa81..1ae6fbbc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sns/SNSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sns/SNSServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.sns; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/solace/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/solace/SolaceServerBinding.java index a8b1467a..dba578a6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/solace/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/solace/SolaceServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.solace; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sqs/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sqs/SQSServerBinding.java index bb6f90ef..fea59315 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sqs/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sqs/SQSServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.sqs; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java index 9d3b4ac5..580d7168 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.stomp; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java index 99f76072..5e6088d8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.binding.server.ws; -import com.asyncapi.v2.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index 1a0dfe52..efeec0ba 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -18,7 +18,7 @@ import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.asyncapi.v3.jackson.binding.channel.ChannelBindingsDeserializer; import com.asyncapi.v3.jackson.binding.message.MessageBindingsDeserializer; import com.asyncapi.v3.jackson.binding.operation.OperationBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java index d6615fd5..af8b476d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java @@ -2,7 +2,7 @@ import com.asyncapi.v3.jackson.binding.server.ServerBindingsDeserializer; import com.asyncapi.v3._0_0.jackson.model.server.ServerVariablesDeserializer; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.asyncapi.ExtendableObject; import com.asyncapi.v3.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ServerBinding.java deleted file mode 100644 index 3f99f480..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ServerBinding.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.asyncapi.v3.binding.server; - -import com.asyncapi.ExtendableObject; -import lombok.EqualsAndHashCode; - -/** - * Describes protocol-specific definition for a server. - *

- * This object MAY be extended with {@link ExtendableObject}. - * - * @see Specification Extensions - * @see Server Binding - * @author Pavel Bodiachevskii - * @version 3.0.0 - */ -@EqualsAndHashCode(callSuper = true) -public class ServerBinding extends ExtendableObject { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp/AMQPServerBinding.java index 17294433..8dc97b20 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp/AMQPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp/AMQPServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.amqp; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp1/AMQP1ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp1/AMQP1ServerBinding.java index a97dbc33..6536e264 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp1/AMQP1ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp1/AMQP1ServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.amqp1; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/anypointmq/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/anypointmq/AnypointMQServerBinding.java index 5771573a..a74ed0c0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/anypointmq/AnypointMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/anypointmq/AnypointMQServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.anypointmq; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/googlepubsub/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/googlepubsub/GooglePubSubServerBinding.java index a8ff818f..5ac8ff3e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/googlepubsub/GooglePubSubServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/googlepubsub/GooglePubSubServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.googlepubsub; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/http/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/http/HTTPServerBinding.java index 85c7e333..3a0073a3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/http/HTTPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/http/HTTPServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.http; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBinding.java index 5b424552..98f649f2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.ibmmq; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/jms/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/jms/JMSServerBinding.java index 406ac082..75093e03 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/jms/JMSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/jms/JMSServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.jms; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/kafka/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/kafka/KafkaServerBinding.java index b0122269..ae2a98c0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/kafka/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/kafka/KafkaServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.kafka; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mercure/MercureServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mercure/MercureServerBinding.java index 6919e41d..2827dc22 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mercure/MercureServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mercure/MercureServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.mercure; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerBinding.java index 29a261d0..077a4f26 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.mqtt; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBinding.java index a9522e04..5e8d92fe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.mqtt5; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.*; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/nats/NATSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/nats/NATSServerBinding.java index 00331b04..6e72dcde 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/nats/NATSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/nats/NATSServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.nats; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/pulsar/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/pulsar/PulsarServerBinding.java index b67d8ef0..91e59205 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/pulsar/PulsarServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/pulsar/PulsarServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.pulsar; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/redis/RedisServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/redis/RedisServerBinding.java index bea734b6..983cab1e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/redis/RedisServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/redis/RedisServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.redis; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sns/SNSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sns/SNSServerBinding.java index 87b7dc42..3058a3aa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sns/SNSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sns/SNSServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.sns; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/solace/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/solace/SolaceServerBinding.java index c98e8470..c3a6f5f9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/solace/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/solace/SolaceServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.solace; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sqs/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sqs/SQSServerBinding.java index ce8f6962..116320ff 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sqs/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sqs/SQSServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.sqs; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java index 871557c8..c2f17108 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.binding.server.stomp; -import com.asyncapi.v3.binding.server.ServerBinding; +import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index a975182e..973d487b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model.server import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.binding.server.ServerBinding +import com.asyncapi.bindings.ServerBinding import com.asyncapi.v2.binding.server.amqp1.AMQP1ServerBinding import com.asyncapi.v2.binding.server.anypointmq.AnypointMQServerBinding import com.asyncapi.v2.binding.server.googlepubsub.GooglePubSubServerBinding From 9c5f5ac7e9d2ff65d5ceddb4084f1e0acb6cbdb1 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 17:50:11 +0400 Subject: [PATCH 007/141] feat(websockets bindings): v2 use common bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/183 --- .../channel/ws/WebSocketsChannelBinding.java | 70 --- .../channel/ws/WebSocketsChannelMethod.java | 13 - .../channel/ChannelBindingsDeserializer.java | 2 +- .../examples/v2/_0_0/WebsocketGemini.kt | 17 +- .../examples/v2/_6_0/WebsocketGemini.kt | 18 +- .../ws/WebSocketsChannelBindingTest.kt | 12 +- .../v2/2.0.0/model/asyncapi - extended.json | 268 +++++++----- .../model/channel/channelItem - extended.json | 134 +++--- .../components/components - extended.json | 134 +++--- .../v2/2.6.0/model/asyncapi - extended.json | 402 ++++++++++-------- .../model/channel/channelItem - extended.json | 134 +++--- .../components/components - extended.json | 268 +++++++----- .../webSocketsChannelBinding - extended.json | 134 +++--- 13 files changed, 851 insertions(+), 755 deletions(-) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelMethod.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBinding.java deleted file mode 100644 index b2845351..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBinding.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.asyncapi.v2.binding.channel.ws; - -import com.asyncapi.bindings.ChannelBinding; -import com.asyncapi.v2.schema.Schema; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes WebSockets channel binding. - *

- * When using WebSockets, the channel represents the connection. Unlike other protocols that support multiple virtual - * channels (topics, routing keys, etc.) per connection, WebSockets doesn't support virtual channels or, put it another - * way, there's only one channel and its characteristics are strongly related to the protocol used for the handshake, - * i.e., HTTP. - * - * @version 0.1.0 - * @see WebSockets channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes WebSockets channel binding.") -public class WebSocketsChannelBinding extends ChannelBinding { - - /** - * The HTTP method to use when establishing the connection. Its value MUST be either GET or POST. - */ - @Nullable - @JsonProperty("method") - @JsonPropertyDescription("The HTTP method to use when establishing the connection. Its value MUST be either GET or POST.") - private WebSocketsChannelMethod method; - - /** - * A Schema object containing the definitions for each query parameter. This schema MUST be of type - * object and have a properties key. - */ - @Nullable - @JsonProperty("query") - @JsonPropertyDescription("A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.") - private Schema query; - - /** - * A Schema object containing the definitions of the HTTP headers to use when establishing the connection. - * This schema MUST be of type object and have a properties key. - */ - @Nullable - @JsonProperty("headers") - @JsonPropertyDescription("A Schema object containing the definitions of the HTTP headers to use when establishing the connection. This schema MUST be of type object and have a properties key.") - private Schema headers; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelMethod.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelMethod.java deleted file mode 100644 index cdee8595..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelMethod.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.asyncapi.v2.binding.channel.ws; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public enum WebSocketsChannelMethod { - - @JsonProperty("GET") - GET, - - @JsonProperty("POST") - POST - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index 0ed343fa..da096286 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.channel.solace.SolaceChannelBinding; import com.asyncapi.v2.binding.channel.sqs.SQSChannelBinding; import com.asyncapi.v2.binding.channel.stomp.STOMPChannelBinding; -import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt index e72c9331..a1fbf8d7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt @@ -9,8 +9,9 @@ import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Contact import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBinding +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding import com.asyncapi.v2.schema.Schema +import com.asyncapi.v3.schema.AsyncAPISchema class WebsocketGemini: AbstractExampleValidationTest() { @@ -133,7 +134,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { "ws", WebSocketsChannelBinding.builder() .query( - Schema.builder() + AsyncAPISchema.builder() .type("object") .description( "The semantics of entry type filtering is:\n" + @@ -146,7 +147,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { .properties(mapOf( Pair( "heartbeat", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(false) .description( @@ -157,7 +158,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "top_of_book", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(false) .description( @@ -169,7 +170,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "bids", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(true) .description("Include bids in change events") @@ -177,7 +178,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "offers", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(true) .description("Include asks in change events") @@ -185,7 +186,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "trades", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(true) .description("Include trade events") @@ -193,7 +194,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "auctions", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(true) .description("Include auction events") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt index e10a4890..692f4168 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt @@ -1,7 +1,6 @@ package com.asyncapi.examples.v2._6_0 import com.asyncapi.v2.Reference -import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.channel.Parameter @@ -11,8 +10,9 @@ import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.Contact import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBinding +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding import com.asyncapi.v2.schema.Schema +import com.asyncapi.v3.schema.AsyncAPISchema class WebsocketGemini: AbstractExampleValidationTest() { @@ -135,7 +135,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { "ws", WebSocketsChannelBinding.builder() .query( - Schema.builder() + AsyncAPISchema.builder() .type("object") .description( "The semantics of entry type filtering is:\n" + @@ -148,7 +148,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { .properties(mapOf( Pair( "heartbeat", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(false) .description( @@ -159,7 +159,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "top_of_book", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(false) .description( @@ -171,7 +171,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "bids", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(true) .description("Include bids in change events") @@ -179,7 +179,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "offers", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(true) .description("Include asks in change events") @@ -187,7 +187,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "trades", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(true) .description("Include trade events") @@ -195,7 +195,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ), Pair( "auctions", - Schema.builder() + AsyncAPISchema.builder() .type("boolean") .defaultValue(true) .description("Include auction events") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBindingTest.kt index 252a01b9..67bcaa2d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBindingTest.kt @@ -1,8 +1,10 @@ package com.asyncapi.v2.binding.channel.ws +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.schema.Type +import com.asyncapi.v3.schema.AsyncAPISchema /** * @version 2.6.0 @@ -21,12 +23,12 @@ class WebSocketsChannelBindingTest: SerDeTest() { override fun build(): WebSocketsChannelBinding { return WebSocketsChannelBinding.builder() .method(WebSocketsChannelMethod.GET) - .query(Schema.builder() + .query(AsyncAPISchema.builder() .type(Type.OBJECT) .properties(mapOf( Pair( "ref", - Schema.builder() + AsyncAPISchema.builder() .type(Type.STRING) .description("Referral.") .build() @@ -34,12 +36,12 @@ class WebSocketsChannelBindingTest: SerDeTest() { )) .build() ) - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type(Type.OBJECT) .properties(mapOf( Pair( "Authentication", - Schema.builder() + AsyncAPISchema.builder() .type(Type.STRING) .description("Authentication token") .build() diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 53b98080..54f14085 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -1986,14 +1986,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2013,14 +2012,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2043,52 +2041,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2108,14 +2115,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2138,42 +2144,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } @@ -4149,14 +4165,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4176,14 +4191,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4206,52 +4220,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4271,14 +4294,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4301,42 +4323,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 0ea9e98e..eefc3c81 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -1890,14 +1890,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1917,14 +1916,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1947,52 +1945,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2012,14 +2019,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2042,42 +2048,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 10f34a1d..ea802ebf 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -1967,14 +1967,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1994,14 +1993,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2024,52 +2022,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2089,14 +2096,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2119,42 +2125,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index fa6bf58a..c13ccf91 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -2812,14 +2812,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2839,14 +2838,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2869,52 +2867,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2934,14 +2941,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2964,42 +2970,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } @@ -6103,14 +6119,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -6130,14 +6145,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -6160,52 +6174,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -6225,14 +6248,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -6255,42 +6277,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } @@ -8103,14 +8135,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8130,14 +8161,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8160,52 +8190,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8225,14 +8264,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8255,42 +8293,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json index b63a038c..fa62ca2b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json @@ -2702,14 +2702,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2729,14 +2728,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2759,52 +2757,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2824,14 +2831,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2854,42 +2860,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 7477382f..80a2150e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -3094,14 +3094,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3121,14 +3120,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3151,52 +3149,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3216,14 +3223,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3246,42 +3252,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } @@ -5094,14 +5110,13 @@ "ws" : { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5121,14 +5136,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5151,52 +5165,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5216,14 +5239,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5246,42 +5268,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - extended.json index 022ca87a..4459c5b3 100644 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - extended.json @@ -1,14 +1,13 @@ { "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -28,14 +27,13 @@ "required" : null, "properties" : { "ref" : { - "title" : null, - "description" : "Referral.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -58,52 +56,61 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Referral.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "headers" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "headers" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -123,14 +130,13 @@ "required" : null, "properties" : { "Authentication" : { - "title" : null, - "description" : "Authentication token", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -153,42 +159,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Authentication token", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0", "x-number" : 0, From 087ede78d6525a2106d02c276e4546a7ed175a42 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 17:55:20 +0400 Subject: [PATCH 008/141] docs(websockets bindings): JavaDoc https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/183 --- .../channel/WebSocketsChannelBinding.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java index abe76163..9aef5009 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java @@ -11,10 +11,11 @@ /** * Describes WebSockets channel binding. *

- * When using WebSockets, the channel represents the connection. Unlike other protocols that support multiple virtual - * channels (topics, routing keys, etc.) per connection, WebSockets doesn't support virtual channels or, put it another - * way, there's only one channel and its characteristics are strongly related to the protocol used for the handshake, - * i.e., HTTP. + * When using WebSockets, the channel represents the connection. + *

+ * Unlike other protocols that support multiple virtual channels (topics, routing keys, etc.) per connection, + * WebSockets doesn't support virtual channels or, put it another way, there's only one channel and its characteristics + * are strongly related to the protocol used for the handshake, i.e., HTTP. * * @version 0.1.0 * @see WebSockets channel binding @@ -29,7 +30,9 @@ public class WebSocketsChannelBinding extends ChannelBinding { /** - * The HTTP method to use when establishing the connection. Its value MUST be either GET or POST. + * The HTTP method to use when establishing the connection. + *

+ * Its value MUST be either GET or POST. */ @Nullable @JsonProperty("method") @@ -37,8 +40,9 @@ public class WebSocketsChannelBinding extends ChannelBinding { private WebSocketsChannelMethod method; /** - * A Schema object containing the definitions for each query parameter. This schema MUST be of type - * object and have a properties key. + * A Schema object containing the definitions for each query parameter. + *

+ * This schema MUST be of type object and have a properties key. */ @Nullable @JsonProperty("query") @@ -47,7 +51,8 @@ public class WebSocketsChannelBinding extends ChannelBinding { /** * A Schema object containing the definitions of the HTTP headers to use when establishing the connection. - * This schema MUST be of type object and have a properties key. + *

+ * This schema MUST be of type object and have a properties key. */ @Nullable @JsonProperty("headers") @@ -55,7 +60,7 @@ public class WebSocketsChannelBinding extends ChannelBinding { private AsyncAPISchema headers; /** - * The version of this binding. If omitted, "latest" MUST be assumed. + * The version of this binding. If omitted, "latest" MUST be assumed. */ @Nullable @Builder.Default From 3e33bec40d0dad32f71b78cd206508574edd9e0d Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 18:06:43 +0400 Subject: [PATCH 009/141] feat(stomp bindings): use common STOMP bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/182 --- .../v0/_1_0/channel}/STOMPChannelBinding.java | 6 ++++-- .../v0/_1_0/message}/STOMPMessageBinding.java | 6 ++++-- .../operation}/STOMPOperationBinding.java | 6 ++++-- .../v0/_1_0/server}/STOMPServerBinding.java | 6 ++++-- .../message/stomp/STOMPMessageBinding.java | 21 ------------------- .../stomp/STOMPOperationBinding.java | 21 ------------------- .../server/stomp/STOMPServerBinding.java | 21 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../channel/stomp/STOMPChannelBinding.java | 21 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../v3/_0_0/model/server/ServerTest.kt | 2 +- 24 files changed, 32 insertions(+), 108 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/stomp => bindings/stomp/v0/_1_0/channel}/STOMPChannelBinding.java (75%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/stomp => bindings/stomp/v0/_1_0/message}/STOMPMessageBinding.java (75%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/stomp => bindings/stomp/v0/_1_0/operation}/STOMPOperationBinding.java (75%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/stomp => bindings/stomp/v0/_1_0/server}/STOMPServerBinding.java (75%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java index 1c4da346..2045091e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/stomp/STOMPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.stomp; +package com.asyncapi.bindings.stomp.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes STOMP channel binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java index a3052965..43812418 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/stomp/STOMPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.stomp; +package com.asyncapi.bindings.stomp.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Data; @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes STOMP message binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java index d5246c3e..b4d15373 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/stomp/STOMPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.stomp; +package com.asyncapi.bindings.stomp.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes STOMP operation binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java index c2f17108..42b65412 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/stomp/STOMPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.stomp; +package com.asyncapi.bindings.stomp.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes STOMP server binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java deleted file mode 100644 index ac314af9..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/stomp/STOMPMessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.message.stomp; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes STOMP message binding. - * - * @version 0.1.0 - * @see STOMP message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class STOMPMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java deleted file mode 100644 index 75cbee65..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/stomp/STOMPOperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.operation.stomp; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes STOMP operation binding. - * - * @version 0.1.0 - * @see STOMP operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class STOMPOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java deleted file mode 100644 index 580d7168..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/stomp/STOMPServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.stomp; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes STOMP server binding. - * - * @version 0.1.0 - * @see STOMP server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class STOMPServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index da096286..7b1b4fe9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding; import com.asyncapi.v2.binding.channel.solace.SolaceChannelBinding; import com.asyncapi.v2.binding.channel.sqs.SQSChannelBinding; -import com.asyncapi.v2.binding.channel.stomp.STOMPChannelBinding; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index 991d2a06..7ca52856 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.message.sns.SNSMessageBinding; import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding; import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding; -import com.asyncapi.v2.binding.message.stomp.STOMPMessageBinding; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index 47392755..eaa1a0e5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding; import com.asyncapi.v2.binding.operation.solace.SolaceOperationBinding; import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding; -import com.asyncapi.v2.binding.operation.stomp.STOMPOperationBinding; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index a896051d..f9f0a6c0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.server.sns.SNSServerBinding; import com.asyncapi.v2.binding.server.solace.SolaceServerBinding; import com.asyncapi.v2.binding.server.sqs.SQSServerBinding; -import com.asyncapi.v2.binding.server.stomp.STOMPServerBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java deleted file mode 100644 index 8064d557..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/stomp/STOMPChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.channel.stomp; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes STOMP channel binding. - * - * @version 0.1.0 - * @see STOMP channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class STOMPChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index 5bbabe2e..d0b78a2e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -18,7 +18,7 @@ import com.asyncapi.v3.binding.channel.sns.SNSChannelBinding; import com.asyncapi.v3.binding.channel.solace.SolaceChannelBinding; import com.asyncapi.v3.binding.channel.sqs.SQSChannelBinding; -import com.asyncapi.v3.binding.channel.stomp.STOMPChannelBinding; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index 081953bb..e64c3025 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -18,7 +18,7 @@ import com.asyncapi.v3.binding.message.sns.SNSMessageBinding; import com.asyncapi.v3.binding.message.solace.SolaceMessageBinding; import com.asyncapi.v3.binding.message.sqs.SQSMessageBinding; -import com.asyncapi.v3.binding.message.stomp.STOMPMessageBinding; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index 39880639..4b88f997 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -18,7 +18,7 @@ import com.asyncapi.v3.binding.operation.sns.SNSOperationBinding; import com.asyncapi.v3.binding.operation.solace.SolaceOperationBinding; import com.asyncapi.v3.binding.operation.sqs.SQSOperationBinding; -import com.asyncapi.v3.binding.operation.stomp.STOMPOperationBinding; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index 15ce53ce..b99eddf5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -18,7 +18,7 @@ import com.asyncapi.v3.binding.server.sns.SNSServerBinding; import com.asyncapi.v3.binding.server.solace.SolaceServerBinding; import com.asyncapi.v3.binding.server.sqs.SQSServerBinding; -import com.asyncapi.v3.binding.server.stomp.STOMPServerBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index bd2f4379..4a8c1139 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -22,7 +22,7 @@ import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding import com.asyncapi.v2.binding.channel.solace.SolaceChannelBinding import com.asyncapi.v2.binding.channel.sqs.SQSChannelBinding -import com.asyncapi.v2.binding.channel.stomp.STOMPChannelBinding +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBindingTest class ChannelItemTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 076377d5..b7557899 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -23,7 +23,7 @@ import com.asyncapi.v2.binding.message.redis.RedisMessageBinding import com.asyncapi.v2.binding.message.sns.SNSMessageBinding import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding -import com.asyncapi.v2.binding.message.stomp.STOMPMessageBinding +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 359fd0e4..33748af2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.v2.binding.message.redis.RedisMessageBinding import com.asyncapi.v2.binding.message.sns.SNSMessageBinding import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding -import com.asyncapi.v2.binding.message.stomp.STOMPMessageBinding +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index d5ee5f54..385dc942 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -23,7 +23,7 @@ import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding -import com.asyncapi.v2.binding.operation.stomp.STOMPOperationBinding +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 39eee0b2..f4e608d0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding -import com.asyncapi.v2.binding.operation.stomp.STOMPOperationBinding +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 973d487b..15b7d3a2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.server.redis.RedisServerBinding import com.asyncapi.v2.binding.server.sns.SNSServerBinding import com.asyncapi.v2.binding.server.solace.SolaceServerBinding import com.asyncapi.v2.binding.server.sqs.SQSServerBinding -import com.asyncapi.v2.binding.server.stomp.STOMPServerBinding +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index e742ad1f..8f4e9527 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.server.redis.RedisServerBinding import com.asyncapi.v2.binding.server.sns.SNSServerBinding import com.asyncapi.v2.binding.server.solace.SolaceServerBinding import com.asyncapi.v2.binding.server.sqs.SQSServerBinding -import com.asyncapi.v2.binding.server.stomp.STOMPServerBinding +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 620e5a61..5a1543a5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.v3.binding.server.redis.RedisServerBinding import com.asyncapi.v3.binding.server.sns.SNSServerBinding import com.asyncapi.v3.binding.server.solace.SolaceServerBinding import com.asyncapi.v3.binding.server.sqs.SQSServerBinding -import com.asyncapi.v3.binding.server.stomp.STOMPServerBinding +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest import com.asyncapi.v3.security_scheme.http.HttpSecuritySchemeBearerTest From ed57b9c46e4d70edef5fdfa575cd5615a08679ab Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 21 Apr 2024 18:11:51 +0400 Subject: [PATCH 010/141] feat(websockets bindings): v2 use common bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/183 --- .../message/ws/WebSocketsMessageBinding.java | 21 ------------------- .../ws/WebSocketsOperationBinding.java | 21 ------------------- .../server/ws/WebSocketsServerBinding.java | 21 ------------------- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- 12 files changed, 9 insertions(+), 72 deletions(-) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java deleted file mode 100644 index 8373c2d1..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.message.ws; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes WebSockets message binding. - * - * @version 0.1.0 - * @see WebSockets message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class WebSocketsMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java deleted file mode 100644 index bfc3adbf..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.operation.ws; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes WebSockets operation binding. - * - * @version 0.1.0 - * @see WebSockets operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class WebSocketsOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java deleted file mode 100644 index 5e6088d8..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.ws; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes WebSockets server binding. - * - * @version 0.1.0 - * @see WebSockets server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class WebSocketsServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index 7ca52856..553d7367 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding; import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; -import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index eaa1a0e5..72b910e7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.operation.solace.SolaceOperationBinding; import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; -import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index f9f0a6c0..859d26f8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.server.solace.SolaceServerBinding; import com.asyncapi.v2.binding.server.sqs.SQSServerBinding; import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; -import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index b7557899..43ffcf35 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -24,7 +24,7 @@ import com.asyncapi.v2.binding.message.sns.SNSMessageBinding import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding -import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding /** * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 33748af2..12bff9fa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -22,7 +22,7 @@ import com.asyncapi.v2.binding.message.sns.SNSMessageBinding import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding -import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding /** * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 385dc942..b6bb4595 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -24,7 +24,7 @@ import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding -import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding /** * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index f4e608d0..1b484e3c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding -import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding /** * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 15b7d3a2..bc712b62 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.server.sns.SNSServerBinding import com.asyncapi.v2.binding.server.solace.SolaceServerBinding import com.asyncapi.v2.binding.server.sqs.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding -import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding /** * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index 8f4e9527..c791811f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.v2.binding.server.sns.SNSServerBinding import com.asyncapi.v2.binding.server.solace.SolaceServerBinding import com.asyncapi.v2.binding.server.sqs.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding -import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding /** * @version 2.6.0 From 4050dd8a1f541da9b168c39097090be96b69168b Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 22 Apr 2024 00:42:44 +0400 Subject: [PATCH 011/141] feat(sqs bindings): use common SQS bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/181 --- .../v0/_1_0/channel}/SQSChannelBinding.java | 6 ++++-- .../v0/_1_0/message}/SQSMessageBinding.java | 6 ++++-- .../_1_0/operation}/SQSOperationBinding.java | 6 ++++-- .../sqs/v0/_1_0/server}/SQSServerBinding.java | 6 ++++-- .../message/sqs/SQSMessageBinding.java | 21 ------------------- .../operation/sqs/SQSOperationBinding.java | 21 ------------------- .../binding/server/sqs/SQSServerBinding.java | 21 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../channel/sqs/SQSChannelBinding.java | 21 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../v3/_0_0/model/server/ServerTest.kt | 2 +- 24 files changed, 32 insertions(+), 108 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/sqs => bindings/sqs/v0/_1_0/channel}/SQSChannelBinding.java (75%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/sqs => bindings/sqs/v0/_1_0/message}/SQSMessageBinding.java (75%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/sqs => bindings/sqs/v0/_1_0/operation}/SQSOperationBinding.java (75%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/sqs => bindings/sqs/v0/_1_0/server}/SQSServerBinding.java (75%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sqs/SQSMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sqs/SQSOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sqs/SQSServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sqs/SQSChannelBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sqs/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sqs/SQSChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java index d8f2ed4e..4f79e1c9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sqs/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.sqs; +package com.asyncapi.bindings.sqs.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes SQS channel binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sqs/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sqs/SQSMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java index 919286c9..357c9af6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sqs/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.sqs; +package com.asyncapi.bindings.sqs.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Data; @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes SQS message binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sqs/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sqs/SQSOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java index 28028bd2..b47c31e4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sqs/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.sqs; +package com.asyncapi.bindings.sqs.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes SQS operation binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sqs/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sqs/SQSServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java index 116320ff..bfbc27af 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sqs/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.sqs; +package com.asyncapi.bindings.sqs.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. *

* Describes SQS server binding. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sqs/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sqs/SQSMessageBinding.java deleted file mode 100644 index 79c89bc3..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sqs/SQSMessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.message.sqs; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes SQS message binding. - * - * @version 0.1.0 - * @see SQS message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SQSMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sqs/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sqs/SQSOperationBinding.java deleted file mode 100644 index 697886f7..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sqs/SQSOperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.operation.sqs; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes SQS operation binding. - * - * @version 0.1.0 - * @see SQS operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SQSOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sqs/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sqs/SQSServerBinding.java deleted file mode 100644 index fea59315..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sqs/SQSServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.sqs; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes SQS server binding. - * - * @version 0.1.0 - * @see SQS server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SQSServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index 7b1b4fe9..c742a1c8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -17,7 +17,7 @@ import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding; import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding; import com.asyncapi.v2.binding.channel.solace.SolaceChannelBinding; -import com.asyncapi.v2.binding.channel.sqs.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index 553d7367..19392c46 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -17,7 +17,7 @@ import com.asyncapi.v2.binding.message.redis.RedisMessageBinding; import com.asyncapi.v2.binding.message.sns.SNSMessageBinding; import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding; -import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index 72b910e7..65ea895f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -17,7 +17,7 @@ import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding; import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding; import com.asyncapi.v2.binding.operation.solace.SolaceOperationBinding; -import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index 859d26f8..a7a89ec7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -17,7 +17,7 @@ import com.asyncapi.v2.binding.server.redis.RedisServerBinding; import com.asyncapi.v2.binding.server.sns.SNSServerBinding; import com.asyncapi.v2.binding.server.solace.SolaceServerBinding; -import com.asyncapi.v2.binding.server.sqs.SQSServerBinding; +import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; import com.asyncapi.v2.jackson.BindingsMapDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sqs/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sqs/SQSChannelBinding.java deleted file mode 100644 index fb48e64c..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sqs/SQSChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.channel.sqs; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes SQS channel binding. - * - * @version 0.1.0 - * @see SQS channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SQSChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index d0b78a2e..06818ce5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -17,7 +17,7 @@ import com.asyncapi.v3.binding.channel.redis.RedisChannelBinding; import com.asyncapi.v3.binding.channel.sns.SNSChannelBinding; import com.asyncapi.v3.binding.channel.solace.SolaceChannelBinding; -import com.asyncapi.v3.binding.channel.sqs.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index e64c3025..b427bf95 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -17,7 +17,7 @@ import com.asyncapi.v3.binding.message.redis.RedisMessageBinding; import com.asyncapi.v3.binding.message.sns.SNSMessageBinding; import com.asyncapi.v3.binding.message.solace.SolaceMessageBinding; -import com.asyncapi.v3.binding.message.sqs.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index 4b88f997..f9b22850 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -17,7 +17,7 @@ import com.asyncapi.v3.binding.operation.redis.RedisOperationBinding; import com.asyncapi.v3.binding.operation.sns.SNSOperationBinding; import com.asyncapi.v3.binding.operation.solace.SolaceOperationBinding; -import com.asyncapi.v3.binding.operation.sqs.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index b99eddf5..ae085e57 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -17,7 +17,7 @@ import com.asyncapi.v3.binding.server.redis.RedisServerBinding; import com.asyncapi.v3.binding.server.sns.SNSServerBinding; import com.asyncapi.v3.binding.server.solace.SolaceServerBinding; -import com.asyncapi.v3.binding.server.sqs.SQSServerBinding; +import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; import com.asyncapi.v3.jackson.BindingsMapDeserializer; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 4a8c1139..0278bdc6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding import com.asyncapi.v2.binding.channel.solace.SolaceChannelBinding -import com.asyncapi.v2.binding.channel.sqs.SQSChannelBinding +import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 43ffcf35..39514c5d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -22,7 +22,7 @@ import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding import com.asyncapi.v2.binding.message.redis.RedisMessageBinding import com.asyncapi.v2.binding.message.sns.SNSMessageBinding import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding -import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding +import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 12bff9fa..fd68370b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding import com.asyncapi.v2.binding.message.redis.RedisMessageBinding import com.asyncapi.v2.binding.message.sns.SNSMessageBinding import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding -import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding +import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index b6bb4595..5d5a3a27 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -22,7 +22,7 @@ import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest -import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding +import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 1b484e3c..a5e01de8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest -import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding +import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index bc712b62..1a235dc0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding import com.asyncapi.v2.binding.server.redis.RedisServerBinding import com.asyncapi.v2.binding.server.sns.SNSServerBinding import com.asyncapi.v2.binding.server.solace.SolaceServerBinding -import com.asyncapi.v2.binding.server.sqs.SQSServerBinding +import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index c791811f..1f4ce816 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding import com.asyncapi.v2.binding.server.redis.RedisServerBinding import com.asyncapi.v2.binding.server.sns.SNSServerBinding import com.asyncapi.v2.binding.server.solace.SolaceServerBinding -import com.asyncapi.v2.binding.server.sqs.SQSServerBinding +import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 5a1543a5..4c431acc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.v3.binding.server.pulsar.PulsarServerBinding import com.asyncapi.v3.binding.server.redis.RedisServerBinding import com.asyncapi.v3.binding.server.sns.SNSServerBinding import com.asyncapi.v3.binding.server.solace.SolaceServerBinding -import com.asyncapi.v3.binding.server.sqs.SQSServerBinding +import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest From a26e9957f82bdc7a8a6d64a5fc240464645d91e6 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 22 Apr 2024 01:33:11 +0400 Subject: [PATCH 012/141] feat(solace bindings): use common Solace bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/180 --- .../_3_0/channel}/SolaceChannelBinding.java | 2 +- .../_3_0/message}/SolaceMessageBinding.java | 2 +- .../operation}/SolaceOperationBinding.java | 2 +- .../SolaceOperationDestination.java | 6 +- .../queue/SolaceOperationQueue.java | 2 +- .../topic/SolaceOperationTopic.java | 2 +- .../v0/_3_0/server}/SolaceServerBinding.java | 2 +- .../solace/SolaceOperationBinding.java | 50 ----------- .../solace/SolaceOperationDestination.java | 83 ------------------- .../server/solace/SolaceServerBinding.java | 48 ----------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../channel/solace/SolaceChannelBinding.java | 23 ----- .../message/solace/SolaceMessageBinding.java | 23 ----- .../solace/queue/SolaceOperationQueue.java | 82 ------------------ .../solace/topic/SolaceOperationTopic.java | 39 --------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../solace/SolaceOperationBindingTest.kt | 6 +- .../server/solace/SolaceServerBindingTest.kt | 1 + .../v3/_0_0/model/server/ServerTest.kt | 2 +- .../solace/SolaceOperationBindingTest.kt | 6 +- .../server/solace/SolaceServerBindingTest.kt | 1 + 32 files changed, 33 insertions(+), 375 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/solace => bindings/solace/v0/_3_0/channel}/SolaceChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/message/solace => bindings/solace/v0/_3_0/message}/SolaceMessageBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/solace => bindings/solace/v0/_3_0/operation}/SolaceOperationBinding.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/solace => bindings/solace/v0/_3_0/operation}/SolaceOperationDestination.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/operation/solace => bindings/solace/v0/_3_0/operation}/queue/SolaceOperationQueue.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/operation/solace => bindings/solace/v0/_3_0/operation}/topic/SolaceOperationTopic.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/solace => bindings/solace/v0/_3_0/server}/SolaceServerBinding.java (95%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationDestination.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/solace/SolaceServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/solace/SolaceChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/solace/SolaceMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/queue/SolaceOperationQueue.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/topic/SolaceOperationTopic.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/solace/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/solace/SolaceChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java index c4020561..4d321493 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/solace/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.solace; +package com.asyncapi.bindings.solace.v0._3_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/solace/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/solace/SolaceMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java index 0ad1ca75..136e96de 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/solace/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.message.solace; +package com.asyncapi.bindings.solace.v0._3_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java index 23c3080c..cb2bb717 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.solace; +package com.asyncapi.bindings.solace.v0._3_0.operation; import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationDestination.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationDestination.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java index ef959dfb..71bcaa25 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/SolaceOperationDestination.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java @@ -1,7 +1,7 @@ -package com.asyncapi.v3.binding.operation.solace; +package com.asyncapi.bindings.solace.v0._3_0.operation; -import com.asyncapi.v3.binding.operation.solace.queue.SolaceOperationQueue; -import com.asyncapi.v3.binding.operation.solace.topic.SolaceOperationTopic; +import com.asyncapi.bindings.solace.v0._3_0.operation.queue.SolaceOperationQueue; +import com.asyncapi.bindings.solace.v0._3_0.operation.topic.SolaceOperationTopic; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/queue/SolaceOperationQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/queue/SolaceOperationQueue.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java index acd627d1..2c702c7d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/queue/SolaceOperationQueue.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.operation.solace.queue; +package com.asyncapi.bindings.solace.v0._3_0.operation.queue; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/topic/SolaceOperationTopic.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/topic/SolaceOperationTopic.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/topic/SolaceOperationTopic.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/topic/SolaceOperationTopic.java index bdf54d6d..18a394cf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/topic/SolaceOperationTopic.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/topic/SolaceOperationTopic.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.operation.solace.topic; +package com.asyncapi.bindings.solace.v0._3_0.operation.topic; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/solace/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/solace/SolaceServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java index c3a6f5f9..84c73ad2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/solace/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.solace; +package com.asyncapi.bindings.solace.v0._3_0.server; import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationBinding.java deleted file mode 100644 index a322976c..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationBinding.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.asyncapi.v2.binding.operation.solace; - -import com.asyncapi.bindings.OperationBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -/** - * Describes Solace operation binding. - *

- * Contains information about the operation representation in Solace PubSub+ Broker. - * - * @version 0.3.0 - * @see Solace operation binding - * @author Dennis Brinley, Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Solace operation binding.") -public class SolaceOperationBinding extends OperationBinding { - - /** - * List of destinations - */ - @Nullable - @JsonProperty("destinations") - @JsonPropertyDescription("List of destinations") - private List destinations; - - /** - * The version of this binding. (e.g. bindingVersion: 0.3.0) - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.3.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationDestination.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationDestination.java deleted file mode 100644 index fb3b075e..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/solace/SolaceOperationDestination.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.asyncapi.v2.binding.operation.solace; - -import com.asyncapi.v2.binding.operation.solace.queue.SolaceOperationQueue; -import com.asyncapi.v2.binding.operation.solace.topic.SolaceOperationTopic; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Solace destination. - *

- * Contains information about the destination in Solace PubSub+ Broker. - * - * @version 0.3.0 - * @see Solace operation binding - * @author Dennis Brinley, Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@JsonClassDescription("Describes Solace destination.") -public class SolaceOperationDestination { - - /** - * 'queue' or 'topic'. If the type is queue, then the subscriber can bind to the queue, which in turn will - * subscribe to the topic as represented by the channel name or to the provided topicSubscriptions. - */ - @Nullable - @JsonProperty("destinationType") - @JsonPropertyDescription("'queue' or 'topic'. If the type is queue, then the subscriber can bind to the queue, which in turn will subscribe to the topic as represented by the channel name or to the provided topicSubscriptions.") - private Type destinationType; - - /** - * 'direct' or 'persistent'. This determines the quality of service for publishing messages as documented here. - * Default is 'persistent'. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "deliveryMode", defaultValue = "persistent") - @JsonPropertyDescription("'direct' or 'persistent'. This determines the quality of service for publishing messages as documented at https://docs.solace.com/Get-Started/Core-Concepts-Message-Delivery-Modes.htm. Default is 'persistent'.") - private DeliveryMode deliveryMode = DeliveryMode.PERSISTENT; - - /** - * Solace queue destination details. - */ - @Nullable - @JsonProperty("queue") - @JsonPropertyDescription("Solace queue destination details.") - private SolaceOperationQueue queue; - - /** - * Solace topic destination details. - */ - @Nullable - @JsonProperty("topic") - @JsonPropertyDescription("Solace topic destination details.") - private SolaceOperationTopic topic; - - public enum Type { - - @JsonProperty("queue") - QUEUE, - @JsonProperty("topic") - TOPIC - - } - - public enum DeliveryMode { - - @JsonProperty("direct") - DIRECT, - @JsonProperty("persistent") - PERSISTENT - - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/solace/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/solace/SolaceServerBinding.java deleted file mode 100644 index dba578a6..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/solace/SolaceServerBinding.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.asyncapi.v2.binding.server.solace; - -import com.asyncapi.bindings.ServerBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Solace server binding. - * - * @version 0.3.0 - * @see Solace server binding - * @author Dennis Brinley, Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Solace server binding.") -public class SolaceServerBinding extends ServerBinding { - - /** - * Message VPN of the Solace Broker - *

- * e.g. msgVpn: solace-broker-msg-vpn - */ - @Nullable - @JsonProperty("msgVpn") - @JsonPropertyDescription("Message VPN of the Solace Broker") - private String msgVpn; - - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.3.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index c742a1c8..34f43551 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBinding; import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding; import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding; -import com.asyncapi.v2.binding.channel.solace.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index 19392c46..e5849e44 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding; import com.asyncapi.v2.binding.message.redis.RedisMessageBinding; import com.asyncapi.v2.binding.message.sns.SNSMessageBinding; -import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index 65ea895f..52db0570 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding; import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding; import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding; -import com.asyncapi.v2.binding.operation.solace.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index a7a89ec7..8dd4d3d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding; import com.asyncapi.v2.binding.server.redis.RedisServerBinding; import com.asyncapi.v2.binding.server.sns.SNSServerBinding; -import com.asyncapi.v2.binding.server.solace.SolaceServerBinding; +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/solace/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/solace/SolaceChannelBinding.java deleted file mode 100644 index 4589b709..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/solace/SolaceChannelBinding.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.asyncapi.v3.binding.channel.solace; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Solace channel binding. - * - * @version 0.3.0 - * @see Solace channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SolaceChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/solace/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/solace/SolaceMessageBinding.java deleted file mode 100644 index 27b9216e..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/solace/SolaceMessageBinding.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.asyncapi.v3.binding.message.solace; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Solace message binding. - * - * @version 0.3.0 - * @see Solace message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SolaceMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/queue/SolaceOperationQueue.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/queue/SolaceOperationQueue.java deleted file mode 100644 index d2c3f5c7..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/queue/SolaceOperationQueue.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.asyncapi.v3.binding.operation.solace.queue; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -/** - * Describes Solace queue. - *

- * Contains information about the queue in Solace PubSub+ Broker. - * - * @version 0.3.0 - * @see Solace operation binding - * @author Dennis Brinley, Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@JsonClassDescription("Describes Solace queue.") -public class SolaceOperationQueue { - - /** - * The name of the queue, only applicable when destinationType is 'queue'. - */ - @Nullable - @JsonProperty("name") - @JsonPropertyDescription("The name of the queue, only applicable when destinationType is 'queue'.") - private String name; - - /** - * A list of topics that the queue subscribes to, only applicable when destinationType is 'queue'. - * If none is given, the queue subscribes to the topic as represented by the channel name. - */ - @Nullable - @JsonProperty("topicSubscriptions") - @JsonPropertyDescription("A list of topics that the queue subscribes to, only applicable when destinationType is 'queue'. If none is given, the queue subscribes to the topic as represented by the channel name.") - private List topicSubscriptions; - - /** - * 'exclusive' or 'nonexclusive'. This is documented here. Only applicable when destinationType is 'queue'. - */ - @Nullable - @JsonProperty("accessType") - @JsonPropertyDescription("'exclusive' or 'nonexclusive'. This is documented at https://docs.solace.com/Messaging/Guaranteed-Msg/Endpoints.htm#Queues. Only applicable when destinationType is 'queue'.") - private AccessType accessType; - - /** - * The maximum amount of message spool that the given queue may use. This is documented here. - * Only applicable when destinationType is 'queue'. - */ - @Nullable - @JsonProperty("maxMsgSpoolSize") - @JsonPropertyDescription("The maximum amount of message spool that the given queue may use. This is documented at https://docs.solace.com/Messaging/Guaranteed-Msg/Message-Spooling.htm#max-spool-usage. Only applicable when destinationType is 'queue'.") - private String maxMsgSpoolSize; - - /** - * The maximum TTL to apply to messages to be spooled. This is documented here. - * Only applicable when destinationType is 'queue'. - */ - @Nullable - @JsonProperty("maxTtl") - @JsonPropertyDescription("The maximum TTL to apply to messages to be spooled. This is documented at https://docs.solace.com/Messaging/Guaranteed-Msg/Configuring-Queues.htm. Only applicable when destinationType is 'queue'.") - private String maxTtl; - - public enum AccessType { - - @JsonProperty("exclusive") - EXCLUSIVE, - @JsonProperty("non-exclusive") - NON_EXCLUSIVE - - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/topic/SolaceOperationTopic.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/topic/SolaceOperationTopic.java deleted file mode 100644 index 9d20880d..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/solace/topic/SolaceOperationTopic.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.v3.binding.operation.solace.topic; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -/** - * Describes Solace topic. - *

- * Contains information about the topic in Solace PubSub+ Broker. - * - * @version 0.3.0 - * @see Solace operation binding - * @author Dennis Brinley, Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@JsonClassDescription("Describes Solace topic.") -public class SolaceOperationTopic { - - /** - * A list of topics that the client subscribes to, only applicable when destinationType is 'topic'. - * If none is given, the client subscribes to the topic as represented by the channel name. - */ - @Nullable - @JsonProperty("topicSubscriptions") - @JsonPropertyDescription("A list of topics that the client subscribes to, only applicable when destinationType is 'topic'. If none is given, the client subscribes to the topic as represented by the channel name.") - protected List topicSubscriptions; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index 06818ce5..cc792eb8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -16,7 +16,7 @@ import com.asyncapi.v3.binding.channel.pulsar.PulsarChannelBinding; import com.asyncapi.v3.binding.channel.redis.RedisChannelBinding; import com.asyncapi.v3.binding.channel.sns.SNSChannelBinding; -import com.asyncapi.v3.binding.channel.solace.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index b427bf95..d212eef7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -16,7 +16,7 @@ import com.asyncapi.v3.binding.message.pulsar.PulsarMessageBinding; import com.asyncapi.v3.binding.message.redis.RedisMessageBinding; import com.asyncapi.v3.binding.message.sns.SNSMessageBinding; -import com.asyncapi.v3.binding.message.solace.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index f9b22850..efd0679f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -16,7 +16,7 @@ import com.asyncapi.v3.binding.operation.pulsar.PulsarOperationBinding; import com.asyncapi.v3.binding.operation.redis.RedisOperationBinding; import com.asyncapi.v3.binding.operation.sns.SNSOperationBinding; -import com.asyncapi.v3.binding.operation.solace.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index ae085e57..2ec3d602 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -16,7 +16,7 @@ import com.asyncapi.v3.binding.server.pulsar.PulsarServerBinding; import com.asyncapi.v3.binding.server.redis.RedisServerBinding; import com.asyncapi.v3.binding.server.sns.SNSServerBinding; -import com.asyncapi.v3.binding.server.solace.SolaceServerBinding; +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 0278bdc6..c4e9b1e3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.channel.nats.NATSChannelBinding import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding -import com.asyncapi.v2.binding.channel.solace.SolaceChannelBinding +import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 39514c5d..29793792 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.v2.binding.message.nats.NATSMessageBinding import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding import com.asyncapi.v2.binding.message.redis.RedisMessageBinding import com.asyncapi.v2.binding.message.sns.SNSMessageBinding -import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding +import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index fd68370b..bea7297d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.message.nats.NATSMessageBinding import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding import com.asyncapi.v2.binding.message.redis.RedisMessageBinding import com.asyncapi.v2.binding.message.sns.SNSMessageBinding -import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding +import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 1a235dc0..76a5918d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.v2.binding.server.nats.NATSServerBinding import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding import com.asyncapi.v2.binding.server.redis.RedisServerBinding import com.asyncapi.v2.binding.server.sns.SNSServerBinding -import com.asyncapi.v2.binding.server.solace.SolaceServerBinding +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index 1f4ce816..f64b9e24 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.server.nats.NATSServerBinding import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding import com.asyncapi.v2.binding.server.redis.RedisServerBinding import com.asyncapi.v2.binding.server.sns.SNSServerBinding -import com.asyncapi.v2.binding.server.solace.SolaceServerBinding +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/solace/SolaceOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/solace/SolaceOperationBindingTest.kt index f62962ad..283f2af7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/solace/SolaceOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/solace/SolaceOperationBindingTest.kt @@ -1,8 +1,10 @@ package com.asyncapi.v2.binding.operation.solace import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.binding.operation.solace.queue.SolaceOperationQueue -import com.asyncapi.v2.binding.operation.solace.topic.SolaceOperationTopic +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationDestination +import com.asyncapi.bindings.solace.v0._3_0.operation.queue.SolaceOperationQueue +import com.asyncapi.bindings.solace.v0._3_0.operation.topic.SolaceOperationTopic class SolaceOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/solace/SolaceServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/solace/SolaceServerBindingTest.kt index f02c7394..dcc14458 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/solace/SolaceServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/solace/SolaceServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.server.solace import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding /** * @version 2.6.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 4c431acc..d554c807 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v3.binding.server.nats.NATSServerBinding import com.asyncapi.v3.binding.server.pulsar.PulsarServerBinding import com.asyncapi.v3.binding.server.redis.RedisServerBinding import com.asyncapi.v3.binding.server.sns.SNSServerBinding -import com.asyncapi.v3.binding.server.solace.SolaceServerBinding +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/solace/SolaceOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/solace/SolaceOperationBindingTest.kt index cae516f2..1ca91a22 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/solace/SolaceOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/solace/SolaceOperationBindingTest.kt @@ -1,8 +1,10 @@ package com.asyncapi.v3.binding.operation.solace import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.binding.operation.solace.queue.SolaceOperationQueue -import com.asyncapi.v3.binding.operation.solace.topic.SolaceOperationTopic +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationDestination +import com.asyncapi.bindings.solace.v0._3_0.operation.queue.SolaceOperationQueue +import com.asyncapi.bindings.solace.v0._3_0.operation.topic.SolaceOperationTopic class SolaceOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/solace/SolaceServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/solace/SolaceServerBindingTest.kt index a95a49d4..3086de35 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/solace/SolaceServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/solace/SolaceServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.server.solace import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding /** * @version 3.0.0 From 95c20676b9b9f604cd107aa270325fc90c14f466 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 22 Apr 2024 01:42:49 +0400 Subject: [PATCH 013/141] feat(sns bindings): use common SNS bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/179 --- .../v0/_1_0/channel}/SNSChannelBinding.java | 2 +- .../v0/_1_0/message}/SNSMessageBinding.java | 2 +- .../_1_0/operation}/SNSOperationBinding.java | 2 +- .../sns/v0/_1_0/server}/SNSServerBinding.java | 2 +- .../message/sns/SNSMessageBinding.java | 21 ------------------- .../operation/sns/SNSOperationBinding.java | 21 ------------------- .../binding/server/sns/SNSServerBinding.java | 21 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../channel/sns/SNSChannelBinding.java | 21 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../v3/_0_0/model/server/ServerTest.kt | 2 +- 24 files changed, 20 insertions(+), 104 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/sns => bindings/sns/v0/_1_0/channel}/SNSChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/sns => bindings/sns/v0/_1_0/message}/SNSMessageBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/sns => bindings/sns/v0/_1_0/operation}/SNSOperationBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/sns => bindings/sns/v0/_1_0/server}/SNSServerBinding.java (91%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sns/SNSMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sns/SNSOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sns/SNSServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sns/SNSChannelBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sns/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sns/SNSChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java index 9d3ee64b..1818458c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/sns/SNSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.sns; +package com.asyncapi.bindings.sns.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sns/SNSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sns/SNSMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java index f3e9cab2..5ed888dc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/sns/SNSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.sns; +package com.asyncapi.bindings.sns.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sns/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sns/SNSOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java index fac389a9..a810ea34 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/sns/SNSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.sns; +package com.asyncapi.bindings.sns.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sns/SNSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sns/SNSServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java index 3058a3aa..48e5779e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/sns/SNSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.sns; +package com.asyncapi.bindings.sns.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sns/SNSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sns/SNSMessageBinding.java deleted file mode 100644 index f6c66b7e..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/sns/SNSMessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.message.sns; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes SNS message binding. - * - * @version 0.1.0 - * @see SNS message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SNSMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sns/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sns/SNSOperationBinding.java deleted file mode 100644 index 62606353..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/sns/SNSOperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.operation.sns; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes SNS operation binding. - * - * @version 0.1.0 - * @see SNS operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SNSOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sns/SNSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sns/SNSServerBinding.java deleted file mode 100644 index 1ae6fbbc..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/sns/SNSServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.sns; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes SNS server binding. - * - * @version 0.1.0 - * @see SNS server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SNSServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index 34f43551..57ef0f19 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.v2.binding.channel.nats.NATSChannelBinding; import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBinding; import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding; -import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding; +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index e5849e44..e5ca2fd9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.v2.binding.message.nats.NATSMessageBinding; import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding; import com.asyncapi.v2.binding.message.redis.RedisMessageBinding; -import com.asyncapi.v2.binding.message.sns.SNSMessageBinding; +import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index 52db0570..f19a9e98 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.v2.binding.operation.nats.NATSOperationBinding; import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding; import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding; -import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding; +import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index 8dd4d3d7..899e279e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.v2.binding.server.nats.NATSServerBinding; import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding; import com.asyncapi.v2.binding.server.redis.RedisServerBinding; -import com.asyncapi.v2.binding.server.sns.SNSServerBinding; +import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sns/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sns/SNSChannelBinding.java deleted file mode 100644 index 16d526f0..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/sns/SNSChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.channel.sns; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes SNS channel binding. - * - * @version 0.1.0 - * @see SNS channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SNSChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index cc792eb8..e44d4b85 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.v3.binding.channel.nats.NATSChannelBinding; import com.asyncapi.v3.binding.channel.pulsar.PulsarChannelBinding; import com.asyncapi.v3.binding.channel.redis.RedisChannelBinding; -import com.asyncapi.v3.binding.channel.sns.SNSChannelBinding; +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index d212eef7..1bba8c45 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.v3.binding.message.nats.NATSMessageBinding; import com.asyncapi.v3.binding.message.pulsar.PulsarMessageBinding; import com.asyncapi.v3.binding.message.redis.RedisMessageBinding; -import com.asyncapi.v3.binding.message.sns.SNSMessageBinding; +import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index efd0679f..6df3d79a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.v3.binding.operation.nats.NATSOperationBinding; import com.asyncapi.v3.binding.operation.pulsar.PulsarOperationBinding; import com.asyncapi.v3.binding.operation.redis.RedisOperationBinding; -import com.asyncapi.v3.binding.operation.sns.SNSOperationBinding; +import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index 2ec3d602..52af0b9d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.v3.binding.server.nats.NATSServerBinding; import com.asyncapi.v3.binding.server.pulsar.PulsarServerBinding; import com.asyncapi.v3.binding.server.redis.RedisServerBinding; -import com.asyncapi.v3.binding.server.sns.SNSServerBinding; +import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index c4e9b1e3..812f9981 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.channel.mqtt5.MQTT5ChannelBinding import com.asyncapi.v2.binding.channel.nats.NATSChannelBinding import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding -import com.asyncapi.v2.binding.channel.sns.SNSChannelBinding +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 29793792..a1f5427b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding import com.asyncapi.v2.binding.message.nats.NATSMessageBinding import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding import com.asyncapi.v2.binding.message.redis.RedisMessageBinding -import com.asyncapi.v2.binding.message.sns.SNSMessageBinding +import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index bea7297d..5016fb7f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding import com.asyncapi.v2.binding.message.nats.NATSMessageBinding import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding import com.asyncapi.v2.binding.message.redis.RedisMessageBinding -import com.asyncapi.v2.binding.message.sns.SNSMessageBinding +import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 5d5a3a27..f82fd14a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding -import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding +import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index a5e01de8..f02b2dae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding -import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding +import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 76a5918d..db64bf02 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding import com.asyncapi.v2.binding.server.nats.NATSServerBinding import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding import com.asyncapi.v2.binding.server.redis.RedisServerBinding -import com.asyncapi.v2.binding.server.sns.SNSServerBinding +import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index f64b9e24..383ba156 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding import com.asyncapi.v2.binding.server.nats.NATSServerBinding import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding import com.asyncapi.v2.binding.server.redis.RedisServerBinding -import com.asyncapi.v2.binding.server.sns.SNSServerBinding +import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index d554c807..643687ef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.v3.binding.server.mqtt5.MQTT5ServerBinding import com.asyncapi.v3.binding.server.nats.NATSServerBinding import com.asyncapi.v3.binding.server.pulsar.PulsarServerBinding import com.asyncapi.v3.binding.server.redis.RedisServerBinding -import com.asyncapi.v3.binding.server.sns.SNSServerBinding +import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding From 429607ab8efa2a52b8a048b2f41658f3d9caf801 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 22 Apr 2024 01:49:32 +0400 Subject: [PATCH 014/141] feat(redis bindings): use common Redis bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/178 --- .../v0/_1_0/channel}/RedisChannelBinding.java | 2 +- .../v0/_1_0/message}/RedisMessageBinding.java | 2 +- .../operation}/RedisOperationBinding.java | 2 +- .../v0/_1_0/server}/RedisServerBinding.java | 2 +- .../message/redis/RedisMessageBinding.java | 21 ------------------- .../redis/RedisOperationBinding.java | 21 ------------------- .../server/redis/RedisServerBinding.java | 21 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../channel/redis/RedisChannelBinding.java | 21 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../v3/_0_0/model/server/ServerTest.kt | 2 +- 24 files changed, 20 insertions(+), 104 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/redis => bindings/redis/v0/_1_0/channel}/RedisChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/redis => bindings/redis/v0/_1_0/message}/RedisMessageBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/redis => bindings/redis/v0/_1_0/operation}/RedisOperationBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/redis => bindings/redis/v0/_1_0/server}/RedisServerBinding.java (91%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/redis/RedisMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/redis/RedisOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/redis/RedisServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/redis/RedisChannelBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/redis/RedisChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/redis/RedisChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java index d926c3a4..c48d1ba4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/redis/RedisChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.redis; +package com.asyncapi.bindings.redis.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/redis/RedisMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/redis/RedisMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java index 9001766c..207fc019 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/redis/RedisMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.redis; +package com.asyncapi.bindings.redis.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/redis/RedisOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/redis/RedisOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java index fde48293..0391cefa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/redis/RedisOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.redis; +package com.asyncapi.bindings.redis.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/redis/RedisServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/redis/RedisServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java index 983cab1e..0b7c7a1f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/redis/RedisServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.redis; +package com.asyncapi.bindings.redis.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/redis/RedisMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/redis/RedisMessageBinding.java deleted file mode 100644 index 36daa1f7..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/redis/RedisMessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.message.redis; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Redis message binding. - * - * @version 0.1.0 - * @see Redis message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class RedisMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/redis/RedisOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/redis/RedisOperationBinding.java deleted file mode 100644 index 8f1a2622..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/redis/RedisOperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.operation.redis; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Redis operation binding. - * - * @version 0.1.0 - * @see Redis operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class RedisOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/redis/RedisServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/redis/RedisServerBinding.java deleted file mode 100644 index 6ee75959..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/redis/RedisServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.redis; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Redis server binding. - * - * @version 0.1.0 - * @see Redis server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class RedisServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index 57ef0f19..3bb8a300 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.v2.binding.channel.mqtt5.MQTT5ChannelBinding; import com.asyncapi.v2.binding.channel.nats.NATSChannelBinding; import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBinding; -import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding; +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index e5ca2fd9..bb36fcec 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding; import com.asyncapi.v2.binding.message.nats.NATSMessageBinding; import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding; -import com.asyncapi.v2.binding.message.redis.RedisMessageBinding; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index f19a9e98..adc565eb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding; import com.asyncapi.v2.binding.operation.nats.NATSOperationBinding; import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding; -import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index 899e279e..53bf5900 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding; import com.asyncapi.v2.binding.server.nats.NATSServerBinding; import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding; -import com.asyncapi.v2.binding.server.redis.RedisServerBinding; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/redis/RedisChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/redis/RedisChannelBinding.java deleted file mode 100644 index e709a190..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/redis/RedisChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.channel.redis; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Redis channel binding. - * - * @version 0.1.0 - * @see Redis channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class RedisChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index e44d4b85..0f09aa7a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.v3.binding.channel.mqtt5.MQTT5ChannelBinding; import com.asyncapi.v3.binding.channel.nats.NATSChannelBinding; import com.asyncapi.v3.binding.channel.pulsar.PulsarChannelBinding; -import com.asyncapi.v3.binding.channel.redis.RedisChannelBinding; +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index 1bba8c45..63e306c3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.v3.binding.message.mqtt5.MQTT5MessageBinding; import com.asyncapi.v3.binding.message.nats.NATSMessageBinding; import com.asyncapi.v3.binding.message.pulsar.PulsarMessageBinding; -import com.asyncapi.v3.binding.message.redis.RedisMessageBinding; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index 6df3d79a..b0df8bb8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.v3.binding.operation.mqtt5.MQTT5OperationBinding; import com.asyncapi.v3.binding.operation.nats.NATSOperationBinding; import com.asyncapi.v3.binding.operation.pulsar.PulsarOperationBinding; -import com.asyncapi.v3.binding.operation.redis.RedisOperationBinding; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index 52af0b9d..79bde02a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.v3.binding.server.mqtt5.MQTT5ServerBinding; import com.asyncapi.v3.binding.server.nats.NATSServerBinding; import com.asyncapi.v3.binding.server.pulsar.PulsarServerBinding; -import com.asyncapi.v3.binding.server.redis.RedisServerBinding; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 812f9981..47c25cb8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.channel.mqtt.MQTTChannelBinding import com.asyncapi.v2.binding.channel.mqtt5.MQTT5ChannelBinding import com.asyncapi.v2.binding.channel.nats.NATSChannelBinding import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest -import com.asyncapi.v2.binding.channel.redis.RedisChannelBinding +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index a1f5427b..7eb2121d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding import com.asyncapi.v2.binding.message.nats.NATSMessageBinding import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding -import com.asyncapi.v2.binding.message.redis.RedisMessageBinding +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 5016fb7f..10a33506 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding import com.asyncapi.v2.binding.message.nats.NATSMessageBinding import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding -import com.asyncapi.v2.binding.message.redis.RedisMessageBinding +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index f82fd14a..43b2ac62 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding -import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index f02b2dae..b25a0eb1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding -import com.asyncapi.v2.binding.operation.redis.RedisOperationBinding +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index db64bf02..63732f8c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding import com.asyncapi.v2.binding.server.nats.NATSServerBinding import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding -import com.asyncapi.v2.binding.server.redis.RedisServerBinding +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index 383ba156..83cc54bf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding import com.asyncapi.v2.binding.server.nats.NATSServerBinding import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding -import com.asyncapi.v2.binding.server.redis.RedisServerBinding +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 643687ef..0d04dda7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.v3.binding.server.mqtt.MQTTServerLastWillConfiguration import com.asyncapi.v3.binding.server.mqtt5.MQTT5ServerBinding import com.asyncapi.v3.binding.server.nats.NATSServerBinding import com.asyncapi.v3.binding.server.pulsar.PulsarServerBinding -import com.asyncapi.v3.binding.server.redis.RedisServerBinding +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding From 24e5ca40747495426e7e4ffb147acf8c4fb2e946 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 22 Apr 2024 01:58:02 +0400 Subject: [PATCH 015/141] feat(pulsar bindings): use common Pulsar bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/177 --- .../_1_0/channel}/PulsarChannelBinding.java | 2 +- .../channel}/PulsarChannelPersistence.java | 2 +- .../PulsarChannelRetentionDefinition.java | 2 +- .../_1_0/message}/PulsarMessageBinding.java | 2 +- .../operation}/PulsarOperationBinding.java | 2 +- .../v0/_1_0/server}/PulsarServerBinding.java | 2 +- .../channel/pulsar/PulsarChannelBinding.java | 105 ------------------ .../PulsarChannelRetentionDefinition.java | 48 -------- .../message/pulsar/PulsarMessageBinding.java | 23 ---- .../server/pulsar/PulsarServerBinding.java | 47 -------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../pulsar/PulsarChannelPersistence.java | 22 ---- .../pulsar/PulsarOperationBinding.java | 23 ---- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../pulsar/PulsarChannelBindingTest.kt | 3 + .../server/pulsar/PulsarServerBindingTest.kt | 1 + .../v3/_0_0/model/server/ServerTest.kt | 2 +- .../pulsar/PulsarChannelBindingTest.kt | 3 + .../server/pulsar/PulsarServerBindingTest.kt | 1 + 31 files changed, 29 insertions(+), 289 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/pulsar => bindings/pulsar/v0/_1_0/channel}/PulsarChannelBinding.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/pulsar => bindings/pulsar/v0/_1_0/channel}/PulsarChannelPersistence.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/pulsar => bindings/pulsar/v0/_1_0/channel}/PulsarChannelRetentionDefinition.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/pulsar => bindings/pulsar/v0/_1_0/message}/PulsarMessageBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/operation/pulsar => bindings/pulsar/v0/_1_0/operation}/PulsarOperationBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/pulsar => bindings/pulsar/v0/_1_0/server}/PulsarServerBinding.java (95%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelRetentionDefinition.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/pulsar/PulsarMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/pulsar/PulsarServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelPersistence.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/pulsar/PulsarOperationBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java index 5d2c904b..b3b9703f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.pulsar; +package com.asyncapi.bindings.pulsar.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelPersistence.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelPersistence.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelPersistence.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelPersistence.java index 14cf634d..c3e9e250 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelPersistence.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelPersistence.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.pulsar; +package com.asyncapi.bindings.pulsar.v0._1_0.channel; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelRetentionDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelRetentionDefinition.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java index badd4b15..1f592c21 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelRetentionDefinition.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.pulsar; +package com.asyncapi.bindings.pulsar.v0._1_0.channel; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/pulsar/PulsarMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/pulsar/PulsarMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java index 52a9ee14..e8091518 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/pulsar/PulsarMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.pulsar; +package com.asyncapi.bindings.pulsar.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/pulsar/PulsarOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/pulsar/PulsarOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java index b5a7242b..6e5f0934 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/pulsar/PulsarOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.operation.pulsar; +package com.asyncapi.bindings.pulsar.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/pulsar/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/pulsar/PulsarServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java index 91e59205..2b907c42 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/pulsar/PulsarServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.pulsar; +package com.asyncapi.bindings.pulsar.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBinding.java deleted file mode 100644 index 98c147da..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBinding.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.asyncapi.v2.binding.channel.pulsar; - -import com.asyncapi.bindings.ChannelBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -/** - * Describes Pulsar channel binding. - * - * @version 0.1.0 - * @see Pulsar channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Pulsar channel binding.") -public class PulsarChannelBinding extends ChannelBinding { - - /** - * The namespace the channel is associated with. - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty("namespace") - @JsonPropertyDescription("The namespace the channel is associated with.") - private String namespace = ""; - - /** - * Persistence of the topic in Pulsar. It MUST be either persistent or non-persistent. - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty(value = "persistence", defaultValue = "persistent") - @JsonPropertyDescription("Persistence of the topic in Pulsar. It MUST be either persistent or non-persistent.") - private PulsarChannelPersistence persistence = PulsarChannelPersistence.PERSISTENT; - - /** - * Topic compaction threshold given in Megabytes. - */ - @Nullable - @javax.validation.constraints.Min( - value = 0, - message = "Topic compaction threshold must be greater or equals to 0." - ) - @JsonProperty("compaction") - @JsonPropertyDescription("Topic compaction threshold given in Megabytes.") - private Integer compaction; - - /** - * A list of clusters the topic is replicated to. - */ - @Nullable - @JsonProperty("geo-replication") - @JsonPropertyDescription("A list of clusters the topic is replicated to.") - private List geoReplication; - - /** - * Topic retention policy. - */ - @Nullable - @JsonProperty("retention") - @JsonPropertyDescription("Topic retention policy.") - private PulsarChannelRetentionDefinition retention; - - /** - * Message time-to-live in seconds. - */ - @Nullable - @JsonProperty("ttl") - @JsonPropertyDescription("Message time-to-live in seconds.") - private Integer ttl; - - /** - * Message deduplication. When true, it ensures that each message produced on Pulsar topics is persisted to disk only once. - */ - @Nullable - @JsonProperty("deduplication") - @JsonPropertyDescription("Message deduplication. When true, it ensures that each message produced on Pulsar topics is persisted to disk only once.") - private Boolean deduplication; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelRetentionDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelRetentionDefinition.java deleted file mode 100644 index 9a23fd29..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelRetentionDefinition.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.asyncapi.v2.binding.channel.pulsar; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Pulsar channel retention definition. - *

- * The Retention Definition Object is used to describe the Pulsar Retention policy. - * - * @version 0.1.0 - * @see Pulsar channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -@JsonClassDescription("Describes Pulsar channel retention definition.") -public class PulsarChannelRetentionDefinition { - - /** - * Time given in Minutes. - */ - @Nullable - @Builder.Default - @JsonProperty("time") - @JsonPropertyDescription("Time given in Minutes.") - private Integer time = 0; - - /** - * Size given in MegaBytes. - */ - @Nullable - @Builder.Default - @JsonProperty("size") - @JsonPropertyDescription("Size given in MegaBytes.") - private Integer size = 0; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/pulsar/PulsarMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/pulsar/PulsarMessageBinding.java deleted file mode 100644 index 94048dd8..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/pulsar/PulsarMessageBinding.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.asyncapi.v2.binding.message.pulsar; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * Describes Pulsar message binding. - *

- * This object MUST NOT contain any properties. Its name is reserved for future use. - * - * @version 0.1.0 - * @see Pulsar message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class PulsarMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/pulsar/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/pulsar/PulsarServerBinding.java deleted file mode 100644 index e664332d..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/pulsar/PulsarServerBinding.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.asyncapi.v2.binding.server.pulsar; - -import com.asyncapi.bindings.ServerBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Pulsar server binding. - * - * @version 0.1.0 - * @see Redis server binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Pulsar server binding.") -public class PulsarServerBinding extends ServerBinding { - - /** - * The pulsar tenant. If omitted, "public" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "tenant", defaultValue = "public") - @JsonPropertyDescription("The pulsar tenant. If omitted, \"public\" MUST be assumed.") - private String tenant = "public"; - - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index 3bb8a300..3cbdd74d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -13,7 +13,7 @@ import com.asyncapi.v2.binding.channel.mqtt.MQTTChannelBinding; import com.asyncapi.v2.binding.channel.mqtt5.MQTT5ChannelBinding; import com.asyncapi.v2.binding.channel.nats.NATSChannelBinding; -import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index bb36fcec..85a0ac20 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -13,7 +13,7 @@ import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBinding; import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding; import com.asyncapi.v2.binding.message.nats.NATSMessageBinding; -import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index adc565eb..e72c48be 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -13,7 +13,7 @@ import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBinding; import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding; import com.asyncapi.v2.binding.operation.nats.NATSOperationBinding; -import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index 53bf5900..b52d7f64 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -13,7 +13,7 @@ import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding; import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding; import com.asyncapi.v2.binding.server.nats.NATSServerBinding; -import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelPersistence.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelPersistence.java deleted file mode 100644 index 8af581a8..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelPersistence.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.asyncapi.v3.binding.channel.pulsar; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes Pulsar channel persistence. - * - * @version 0.1.0 - * @see Pulsar channel binding - * @author Pavel Bodiachevskii - */ -@JsonClassDescription("Describes Pulsar channel persistence.") -public enum PulsarChannelPersistence { - - @JsonProperty("persistent") - PERSISTENT, - - @JsonProperty("non-persistent") - NON_PERSISTENT - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/pulsar/PulsarOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/pulsar/PulsarOperationBinding.java deleted file mode 100644 index 576987ca..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/pulsar/PulsarOperationBinding.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.asyncapi.v3.binding.operation.pulsar; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * Describes Pulsar operation binding. - *

- * This object MUST NOT contain any properties. Its name is reserved for future use. - * - * @version 0.1.0 - * @see Pulsar operation binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class PulsarOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index 0f09aa7a..e1d5ec2e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -13,7 +13,7 @@ import com.asyncapi.v3.binding.channel.mqtt.MQTTChannelBinding; import com.asyncapi.v3.binding.channel.mqtt5.MQTT5ChannelBinding; import com.asyncapi.v3.binding.channel.nats.NATSChannelBinding; -import com.asyncapi.v3.binding.channel.pulsar.PulsarChannelBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index 63e306c3..d1eede1e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -13,7 +13,7 @@ import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBinding; import com.asyncapi.v3.binding.message.mqtt5.MQTT5MessageBinding; import com.asyncapi.v3.binding.message.nats.NATSMessageBinding; -import com.asyncapi.v3.binding.message.pulsar.PulsarMessageBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index b0df8bb8..7d10d538 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -13,7 +13,7 @@ import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBinding; import com.asyncapi.v3.binding.operation.mqtt5.MQTT5OperationBinding; import com.asyncapi.v3.binding.operation.nats.NATSOperationBinding; -import com.asyncapi.v3.binding.operation.pulsar.PulsarOperationBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index 79bde02a..4414ee16 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -13,7 +13,7 @@ import com.asyncapi.v3.binding.server.mqtt.MQTTServerBinding; import com.asyncapi.v3.binding.server.mqtt5.MQTT5ServerBinding; import com.asyncapi.v3.binding.server.nats.NATSServerBinding; -import com.asyncapi.v3.binding.server.pulsar.PulsarServerBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 7eb2121d..f6226bfe 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding import com.asyncapi.v2.binding.message.nats.NATSMessageBinding -import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding +import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 10a33506..fafd07d6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding import com.asyncapi.v2.binding.message.nats.NATSMessageBinding -import com.asyncapi.v2.binding.message.pulsar.PulsarMessageBinding +import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 43b2ac62..6f00b9ef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest -import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding +import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index b25a0eb1..4f95b272 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest -import com.asyncapi.v2.binding.operation.pulsar.PulsarOperationBinding +import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 63732f8c..6ec0c096 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding import com.asyncapi.v2.binding.server.nats.NATSServerBinding -import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index 83cc54bf..e1efa1ad 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding import com.asyncapi.v2.binding.server.nats.NATSServerBinding -import com.asyncapi.v2.binding.server.pulsar.PulsarServerBinding +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBindingTest.kt index 7d7f7b85..8a9076d1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBindingTest.kt @@ -1,6 +1,9 @@ package com.asyncapi.v2.binding.channel.pulsar import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelPersistence +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelRetentionDefinition class PulsarChannelBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/pulsar/PulsarServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/pulsar/PulsarServerBindingTest.kt index 869986ea..627800a1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/pulsar/PulsarServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/pulsar/PulsarServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.server.pulsar import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding /** * @version 2.6.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 0d04dda7..77359a63 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -16,7 +16,7 @@ import com.asyncapi.v3.binding.server.mqtt.MQTTServerBinding import com.asyncapi.v3.binding.server.mqtt.MQTTServerLastWillConfiguration import com.asyncapi.v3.binding.server.mqtt5.MQTT5ServerBinding import com.asyncapi.v3.binding.server.nats.NATSServerBinding -import com.asyncapi.v3.binding.server.pulsar.PulsarServerBinding +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBindingTest.kt index 2c2d6da8..3bad39d7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBindingTest.kt @@ -1,6 +1,9 @@ package com.asyncapi.v3.binding.channel.pulsar import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelPersistence +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelRetentionDefinition class PulsarChannelBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/pulsar/PulsarServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/pulsar/PulsarServerBindingTest.kt index 1daee16b..75b33dcc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/pulsar/PulsarServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/pulsar/PulsarServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.server.pulsar import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding /** * @version 3.0.0 From 252b2e4c57a0877105de8a073b81c9adb444c520 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 22 Apr 2024 02:06:07 +0400 Subject: [PATCH 016/141] feat(nats bindings): use common NATS bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/176 --- .../v0/_1_0/channel}/NATSChannelBinding.java | 2 +- .../v0/_1_0/message}/NATSMessageBinding.java | 2 +- .../_1_0/operation}/NATSOperationBinding.java | 2 +- .../v0/_1_0/server}/NATSServerBinding.java | 2 +- .../message/nats/NATSMessageBinding.java | 21 -------- .../operation/nats/NATSOperationBinding.java | 50 ------------------- .../server/nats/NATSServerBinding.java | 21 -------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../channel/nats/NATSChannelBinding.java | 21 -------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../nats/NATSOperationBindingTest.kt | 1 + .../v3/_0_0/model/server/ServerTest.kt | 2 +- .../nats/NATSOperationBindingTest.kt | 1 + 24 files changed, 20 insertions(+), 131 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/nats => bindings/nats/v0/_1_0/channel}/NATSChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/nats => bindings/nats/v0/_1_0/message}/NATSMessageBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/nats => bindings/nats/v0/_1_0/operation}/NATSOperationBinding.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/nats => bindings/nats/v0/_1_0/server}/NATSServerBinding.java (91%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/nats/NATSMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/nats/NATSOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/nats/NATSServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/nats/NATSChannelBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/nats/NATSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/nats/NATSChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java index 9ecece24..48edd968 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/nats/NATSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.nats; +package com.asyncapi.bindings.nats.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/nats/NATSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/nats/NATSMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java index b6c24fde..7962703f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/nats/NATSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.nats; +package com.asyncapi.bindings.nats.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/nats/NATSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/nats/NATSOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java index a29cc10d..85c624e9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/nats/NATSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.nats; +package com.asyncapi.bindings.nats.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/nats/NATSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/nats/NATSServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java index 6e72dcde..e5414531 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/nats/NATSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.nats; +package com.asyncapi.bindings.nats.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/nats/NATSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/nats/NATSMessageBinding.java deleted file mode 100644 index d8cb8506..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/nats/NATSMessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.message.nats; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes NATS message binding. - * - * @version 0.1.0 - * @see NATS message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class NATSMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/nats/NATSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/nats/NATSOperationBinding.java deleted file mode 100644 index 379db0bb..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/nats/NATSOperationBinding.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.asyncapi.v2.binding.operation.nats; - -import com.asyncapi.bindings.OperationBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes NATS operation binding. - * - * @version 0.1.0 - * @see NATS operation binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes NATS operation binding.") -public class NATSOperationBinding extends OperationBinding { - - /** - * Defines the name of the queue to use. It MUST NOT exceed 255 characters. - */ - @Nullable - @javax.validation.constraints.Size( - max = 255, - message = "Queue name must be lower or equals to 255." - ) - @JsonProperty("queue") - @JsonPropertyDescription("Defines the name of the queue to use. It MUST NOT exceed 255 characters.") - private String queue; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/nats/NATSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/nats/NATSServerBinding.java deleted file mode 100644 index 8a8ffa28..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/nats/NATSServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.nats; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes NATS channel binding. - * - * @version 0.1.0 - * @see NATS server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class NATSServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index 3cbdd74d..6c20319e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.v2.binding.channel.mercure.MercureChannelBinding; import com.asyncapi.v2.binding.channel.mqtt.MQTTChannelBinding; import com.asyncapi.v2.binding.channel.mqtt5.MQTT5ChannelBinding; -import com.asyncapi.v2.binding.channel.nats.NATSChannelBinding; +import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index 85a0ac20..5846948a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding; import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBinding; import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding; -import com.asyncapi.v2.binding.message.nats.NATSMessageBinding; +import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index e72c48be..c95af57b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding; import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBinding; import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding; -import com.asyncapi.v2.binding.operation.nats.NATSOperationBinding; +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index b52d7f64..4c455dc7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.v2.binding.server.mercure.MercureServerBinding; import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding; import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding; -import com.asyncapi.v2.binding.server.nats.NATSServerBinding; +import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/nats/NATSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/nats/NATSChannelBinding.java deleted file mode 100644 index 67c7f08e..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/nats/NATSChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.channel.nats; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes NATS channel binding. - * - * @version 0.1.0 - * @see NATS channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class NATSChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index e1d5ec2e..94b21f18 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.v3.binding.channel.mercure.MercureChannelBinding; import com.asyncapi.v3.binding.channel.mqtt.MQTTChannelBinding; import com.asyncapi.v3.binding.channel.mqtt5.MQTT5ChannelBinding; -import com.asyncapi.v3.binding.channel.nats.NATSChannelBinding; +import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index d1eede1e..fa11c1f6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.v3.binding.message.mercure.MercureMessageBinding; import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBinding; import com.asyncapi.v3.binding.message.mqtt5.MQTT5MessageBinding; -import com.asyncapi.v3.binding.message.nats.NATSMessageBinding; +import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index 7d10d538..908b71b7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.v3.binding.operation.mercure.MercureOperationBinding; import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBinding; import com.asyncapi.v3.binding.operation.mqtt5.MQTT5OperationBinding; -import com.asyncapi.v3.binding.operation.nats.NATSOperationBinding; +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index 4414ee16..ab1c8a2a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.v3.binding.server.mercure.MercureServerBinding; import com.asyncapi.v3.binding.server.mqtt.MQTTServerBinding; import com.asyncapi.v3.binding.server.mqtt5.MQTT5ServerBinding; -import com.asyncapi.v3.binding.server.nats.NATSServerBinding; +import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 47c25cb8..45fdfb28 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest import com.asyncapi.v2.binding.channel.mercure.MercureChannelBinding import com.asyncapi.v2.binding.channel.mqtt.MQTTChannelBinding import com.asyncapi.v2.binding.channel.mqtt5.MQTT5ChannelBinding -import com.asyncapi.v2.binding.channel.nats.NATSChannelBinding +import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index f6226bfe..600c4004 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding -import com.asyncapi.v2.binding.message.nats.NATSMessageBinding +import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index fafd07d6..36079399 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding -import com.asyncapi.v2.binding.message.nats.NATSMessageBinding +import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 6ec0c096..53516ded 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.v2.binding.server.mercure.MercureServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding -import com.asyncapi.v2.binding.server.nats.NATSServerBinding +import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index e1efa1ad..7a627b93 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.v2.binding.server.mercure.MercureServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding -import com.asyncapi.v2.binding.server.nats.NATSServerBinding +import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/nats/NATSOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/nats/NATSOperationBindingTest.kt index 9c2991a6..77cfa259 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/nats/NATSOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/nats/NATSOperationBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.operation.nats import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding class NATSOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 77359a63..b04640a0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.v3.binding.server.mercure.MercureServerBinding import com.asyncapi.v3.binding.server.mqtt.MQTTServerBinding import com.asyncapi.v3.binding.server.mqtt.MQTTServerLastWillConfiguration import com.asyncapi.v3.binding.server.mqtt5.MQTT5ServerBinding -import com.asyncapi.v3.binding.server.nats.NATSServerBinding +import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/nats/NATSOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/nats/NATSOperationBindingTest.kt index 60f0ef6c..25ada9b2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/nats/NATSOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/nats/NATSOperationBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.operation.nats import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding class NATSOperationBindingTest: SerDeTest() { From 031e9402b46d9f7c22e8ab298401f6fa113b15f4 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 22 Apr 2024 02:16:52 +0400 Subject: [PATCH 017/141] feat(mqtt5 bindings): use common MQTT5 bindings https://github.com/asyncapi/jasyncapi/issues/184 --- .../v0/_2_0/channel}/MQTT5ChannelBinding.java | 2 +- .../v0/_2_0/message}/MQTT5MessageBinding.java | 2 +- .../operation}/MQTT5OperationBinding.java | 2 +- .../v0/_2_0/server}/MQTT5ServerBinding.java | 2 +- .../mqtt5/MQTT5OperationBinding.java | 21 ------------ .../server/mqtt5/MQTT5ServerBinding.java | 33 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../channel/mqtt5/MQTT5ChannelBinding.java | 21 ------------ .../message/mqtt5/MQTT5MessageBinding.java | 21 ------------ .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../server/mqtt5/MQTT5ServerBindingTest.kt | 1 + .../v3/_0_0/model/server/ServerTest.kt | 2 +- .../server/mqtt5/MQTT5ServerBindingTest.kt | 1 + 26 files changed, 22 insertions(+), 116 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/mqtt5 => bindings/mqtt5/v0/_2_0/channel}/MQTT5ChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/message/mqtt5 => bindings/mqtt5/v0/_2_0/message}/MQTT5MessageBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/mqtt5 => bindings/mqtt5/v0/_2_0/operation}/MQTT5OperationBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/mqtt5 => bindings/mqtt5/v0/_2_0/server}/MQTT5ServerBinding.java (93%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt5/MQTT5OperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt5/MQTT5ChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt5/MQTT5MessageBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt5/MQTT5ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/channel/MQTT5ChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt5/MQTT5ChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/channel/MQTT5ChannelBinding.java index 21f39403..0e8ce3e0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt5/MQTT5ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/channel/MQTT5ChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.mqtt5; +package com.asyncapi.bindings.mqtt5.v0._2_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt5/MQTT5MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/message/MQTT5MessageBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt5/MQTT5MessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/message/MQTT5MessageBinding.java index f1409b2f..39161990 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt5/MQTT5MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/message/MQTT5MessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.message.mqtt5; +package com.asyncapi.bindings.mqtt5.v0._2_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt5/MQTT5OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/operation/MQTT5OperationBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt5/MQTT5OperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/operation/MQTT5OperationBinding.java index 5306ea2e..9f74ddc2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt5/MQTT5OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/operation/MQTT5OperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.mqtt5; +package com.asyncapi.bindings.mqtt5.v0._2_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java similarity index 93% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java index 5e8d92fe..d3a27b87 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.mqtt5; +package com.asyncapi.bindings.mqtt5.v0._2_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt5/MQTT5OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt5/MQTT5OperationBinding.java deleted file mode 100644 index 659df771..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt5/MQTT5OperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.operation.mqtt5; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes MQTT 5 operation binding. - * - * @version 0.2.0 - * @see MQTT 5 operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MQTT5OperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBinding.java deleted file mode 100644 index 3e380f90..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBinding.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.asyncapi.v2.binding.server.mqtt5; - -import com.asyncapi.bindings.ServerBinding; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * Describes MQTT 5 server binding. - * - * @version 0.2.0 - * @see MQTT 5 server binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MQTT5ServerBinding extends ServerBinding { - - /** - * TODO: support reference, Schema object - * Session Expiry Interval in seconds or a Schema Object containing the definition of the interval. - */ - private int sessionExpiryInterval; - - @Builder.Default - private String bindingVersion = "0.2.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index 6c20319e..0a7de515 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBinding; import com.asyncapi.v2.binding.channel.mercure.MercureChannelBinding; import com.asyncapi.v2.binding.channel.mqtt.MQTTChannelBinding; -import com.asyncapi.v2.binding.channel.mqtt5.MQTT5ChannelBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index 5846948a..b585f6e0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.v2.binding.message.kafka.KafkaMessageBinding; import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding; import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBinding; -import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index c95af57b..1baff265 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBinding; import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding; import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBinding; -import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index 4c455dc7..c23c0358 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.v2.binding.server.kafka.KafkaServerBinding; import com.asyncapi.v2.binding.server.mercure.MercureServerBinding; import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding; -import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt5/MQTT5ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt5/MQTT5ChannelBinding.java deleted file mode 100644 index a64d31e5..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt5/MQTT5ChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.channel.mqtt5; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes MQTT 5 channel binding. - * - * @version 0.2.0 - * @see MQTT 5 channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MQTT5ChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt5/MQTT5MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt5/MQTT5MessageBinding.java deleted file mode 100644 index 8a235e0f..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt5/MQTT5MessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.message.mqtt5; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes MQTT 5 message binding. - * - * @version 0.2.0 - * @see MQTT 5 message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MQTT5MessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index 94b21f18..d56d1df2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.v3.binding.channel.kafka.KafkaChannelBinding; import com.asyncapi.v3.binding.channel.mercure.MercureChannelBinding; import com.asyncapi.v3.binding.channel.mqtt.MQTTChannelBinding; -import com.asyncapi.v3.binding.channel.mqtt5.MQTT5ChannelBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index fa11c1f6..119262e5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.v3.binding.message.kafka.KafkaMessageBinding; import com.asyncapi.v3.binding.message.mercure.MercureMessageBinding; import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBinding; -import com.asyncapi.v3.binding.message.mqtt5.MQTT5MessageBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index 908b71b7..b92f44d5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBinding; import com.asyncapi.v3.binding.operation.mercure.MercureOperationBinding; import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBinding; -import com.asyncapi.v3.binding.operation.mqtt5.MQTT5OperationBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index ab1c8a2a..ef5426d8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.v3.binding.server.kafka.KafkaServerBinding; import com.asyncapi.v3.binding.server.mercure.MercureServerBinding; import com.asyncapi.v3.binding.server.mqtt.MQTTServerBinding; -import com.asyncapi.v3.binding.server.mqtt5.MQTT5ServerBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 45fdfb28..2a09b3bc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.v2.binding.channel.jms.JMSChannelBinding import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest import com.asyncapi.v2.binding.channel.mercure.MercureChannelBinding import com.asyncapi.v2.binding.channel.mqtt.MQTTChannelBinding -import com.asyncapi.v2.binding.channel.mqtt5.MQTT5ChannelBinding +import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 600c4004..743da469 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.message.jms.JMSMessageBinding import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest -import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding +import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 36079399..9bd048db 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.v2.binding.message.jms.JMSMessageBinding import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest -import com.asyncapi.v2.binding.message.mqtt5.MQTT5MessageBinding +import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 6f00b9ef..168de5b0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -16,7 +16,7 @@ import com.asyncapi.v2.binding.operation.jms.JMSOperationBinding import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest -import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding +import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 4f95b272..1ae7d466 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.v2.binding.operation.jms.JMSOperationBinding import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest -import com.asyncapi.v2.binding.operation.mqtt5.MQTT5OperationBinding +import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 53516ded..bef86ee6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.v2.binding.server.kafka.KafkaServerBinding import com.asyncapi.v2.binding.server.mercure.MercureServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration -import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index 7a627b93..e0305ae6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.v2.binding.server.kafka.KafkaServerBinding import com.asyncapi.v2.binding.server.mercure.MercureServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration -import com.asyncapi.v2.binding.server.mqtt5.MQTT5ServerBinding +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBindingTest.kt index a80e4af4..8a51dc8f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.server.mqtt5 import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding /** * @version 2.6.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index b04640a0..47ba4c7d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.v3.binding.server.kafka.KafkaServerBinding import com.asyncapi.v3.binding.server.mercure.MercureServerBinding import com.asyncapi.v3.binding.server.mqtt.MQTTServerBinding import com.asyncapi.v3.binding.server.mqtt.MQTTServerLastWillConfiguration -import com.asyncapi.v3.binding.server.mqtt5.MQTT5ServerBinding +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt index 23cd7f3d..f5595928 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.server.mqtt5 import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding /** * @version 3.0.0 From 65e9341cf66dd17a69d84b720d6cfa6cdbc2aadb Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 22 Apr 2024 02:27:06 +0400 Subject: [PATCH 018/141] feat(mqtt bindings): use common MQTT bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/175 --- .../v0/_1_0/channel}/MQTTChannelBinding.java | 2 +- .../v0/_1_0/message}/MQTTMessageBinding.java | 2 +- .../_1_0/operation}/MQTTOperationBinding.java | 2 +- .../v0/_1_0/server}/MQTTServerBinding.java | 2 +- .../MQTTServerLastWillConfiguration.java | 2 +- .../message/mqtt/MQTTMessageBinding.java | 38 ------------------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../channel/mqtt/MQTTChannelBinding.java | 21 ---------- .../channel/ChannelBindingsDeserializer.java | 2 +- .../message/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../server/ServerBindingsDeserializer.java | 2 +- .../examples/v2/_0_0/StreetlightsMQTT.kt | 2 +- .../examples/v2/_6_0/StreetlightsMQTT.kt | 2 +- .../v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../message/mqtt/MQTTMessageBindingTest.kt | 1 + .../mqtt/MQTTOperationBindingTest.kt | 1 + .../v3/_0_0/model/server/ServerTest.kt | 4 +- .../message/mqtt/MQTTMessageBindingTest.kt | 1 + .../mqtt/MQTTOperationBindingTest.kt | 1 + .../server/mqtt/MQTTServerBindingTest.kt | 2 + 24 files changed, 24 insertions(+), 77 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/mqtt => bindings/mqtt/v0/_1_0/channel}/MQTTChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/mqtt => bindings/mqtt/v0/_1_0/message}/MQTTMessageBinding.java (94%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/mqtt => bindings/mqtt/v0/_1_0/operation}/MQTTOperationBinding.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/mqtt => bindings/mqtt/v0/_1_0/server}/MQTTServerBinding.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/mqtt => bindings/mqtt/v0/_1_0/server}/MQTTServerLastWillConfiguration.java (97%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt/MQTTChannelBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt/MQTTChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java index 1ea67bbc..b549f503 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mqtt/MQTTChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.mqtt; +package com.asyncapi.bindings.mqtt.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java similarity index 94% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java index bcb3ea70..6f2dbd70 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.mqtt; +package com.asyncapi.bindings.mqtt.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java index 1274619b..71f9e322 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.mqtt; +package com.asyncapi.bindings.mqtt.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java index 077a4f26..efa27de1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.mqtt; +package com.asyncapi.bindings.mqtt.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerLastWillConfiguration.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerLastWillConfiguration.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerLastWillConfiguration.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerLastWillConfiguration.java index 99e63a48..72ebf864 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mqtt/MQTTServerLastWillConfiguration.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerLastWillConfiguration.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.mqtt; +package com.asyncapi.bindings.mqtt.v0._1_0.server; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBinding.java deleted file mode 100644 index 8f0be837..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBinding.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.asyncapi.v2.binding.message.mqtt; - -import com.asyncapi.bindings.MessageBinding; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes MQTT message binding. - *

- * Contains information about the message representation in MQTT. - * - * @version 0.1.0 - * @see MQTT message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MQTTMessageBinding extends MessageBinding { - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index 0a7de515..ec2c3593 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.v2.binding.channel.jms.JMSChannelBinding; import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBinding; import com.asyncapi.v2.binding.channel.mercure.MercureChannelBinding; -import com.asyncapi.v2.binding.channel.mqtt.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index b585f6e0..d0ffbb11 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.v2.binding.message.jms.JMSMessageBinding; import com.asyncapi.v2.binding.message.kafka.KafkaMessageBinding; import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding; -import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index 1baff265..33980f72 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.v2.binding.operation.jms.JMSOperationBinding; import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBinding; import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding; -import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt/MQTTChannelBinding.java deleted file mode 100644 index 1c5f6ca9..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mqtt/MQTTChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.channel.mqtt; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes MQTT channel binding. - * - * @version 0.1.0 - * @see MQTT channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MQTTChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index d56d1df2..109541ea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.v3.binding.channel.jms.JMSChannelBinding; import com.asyncapi.v3.binding.channel.kafka.KafkaChannelBinding; import com.asyncapi.v3.binding.channel.mercure.MercureChannelBinding; -import com.asyncapi.v3.binding.channel.mqtt.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index 119262e5..360c0504 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.v3.binding.message.jms.JMSMessageBinding; import com.asyncapi.v3.binding.message.kafka.KafkaMessageBinding; import com.asyncapi.v3.binding.message.mercure.MercureMessageBinding; -import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index b92f44d5..f7b1c0bd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.v3.binding.operation.jms.JMSOperationBinding; import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBinding; import com.asyncapi.v3.binding.operation.mercure.MercureOperationBinding; -import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index ef5426d8..645dbe9f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.v3.binding.server.jms.JMSServerBinding; import com.asyncapi.v3.binding.server.kafka.KafkaServerBinding; import com.asyncapi.v3.binding.server.mercure.MercureServerBinding; -import com.asyncapi.v3.binding.server.mqtt.MQTTServerBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt index 0ceb940d..7fa4c29d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt @@ -13,7 +13,7 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable -import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBinding +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt index 44b393b0..0760fa81 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt @@ -13,7 +13,7 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable -import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBinding +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index 355912e2..06bf335b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -16,7 +16,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable -import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBinding +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 2a09b3bc..9ec414eb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest import com.asyncapi.v2.binding.channel.jms.JMSChannelBinding import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest import com.asyncapi.v2.binding.channel.mercure.MercureChannelBinding -import com.asyncapi.v2.binding.channel.mqtt.MQTTChannelBinding +import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBindingTest.kt index 43791dd2..81c970f5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.message.mqtt import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding class MQTTMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBindingTest.kt index 9bba70c1..17cad2c6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.operation.mqtt import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding class MQTTOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 47ba4c7d..f09a5788 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -12,8 +12,8 @@ import com.asyncapi.v3.binding.server.ibmmq.IBMMQServerBinding import com.asyncapi.v3.binding.server.jms.JMSServerBinding import com.asyncapi.v3.binding.server.kafka.KafkaServerBinding import com.asyncapi.v3.binding.server.mercure.MercureServerBinding -import com.asyncapi.v3.binding.server.mqtt.MQTTServerBinding -import com.asyncapi.v3.binding.server.mqtt.MQTTServerLastWillConfiguration +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBindingTest.kt index d327ec4e..8cfe6b1c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.message.mqtt import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding class MQTTMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBindingTest.kt index e199cf50..504b42cb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.operation.mqtt import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding class MQTTOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt/MQTTServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt/MQTTServerBindingTest.kt index 9dccffeb..cdac90e3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt/MQTTServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt/MQTTServerBindingTest.kt @@ -1,6 +1,8 @@ package com.asyncapi.v3.binding.server.mqtt import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration /** * @version 3.0.0 From 7a397f3ae29a77c0791eb38fc40c7b6081d948c8 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 22 Apr 2024 02:29:55 +0400 Subject: [PATCH 019/141] feat(mqtt bindings): use common MQTT bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/175 --- .../operation/mqtt/MQTTOperationBinding.java | 71 ------------------ .../server/mqtt/MQTTServerBinding.java | 72 ------------------- .../mqtt/MQTTServerLastWillConfiguration.java | 65 ----------------- .../server/ServerBindingsDeserializer.java | 2 +- .../v2/_0_0/model/server/ServerTest.kt | 4 +- .../v2/_6_0/model/server/ServerTest.kt | 4 +- .../server/mqtt/MQTTServerBindingTest.kt | 2 + 7 files changed, 7 insertions(+), 213 deletions(-) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerLastWillConfiguration.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBinding.java deleted file mode 100644 index c58f69a4..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBinding.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.asyncapi.v2.binding.operation.mqtt; - -import com.asyncapi.bindings.OperationBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes MQTT operation binding. - *

- * Contains information about the operation representation in MQTT. - * - * @version 0.1.0 - * @see MQTT operation binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes MQTT operation binding.") -public class MQTTOperationBinding extends OperationBinding { - - /** - * Defines how hard the broker/client will try to ensure that a message is received. - * Its value MUST be either 0, 1 or 2. - *

- * Applies to: publish, subscribe - */ - @Nullable - @javax.validation.constraints.Min( - value = 0, - message = "QoS must be greater or equals to 0." - ) - @javax.validation.constraints.Max( - value = 2, - message = "QoS must be lower or equals to 0." - ) - @JsonProperty("qos") - @JsonPropertyDescription("Defines the Quality of Service (QoS) levels for the message flow between client and server. Its value MUST be either 0 (At most once delivery), 1 (At least once delivery), or 2 (Exactly once delivery).") - private Integer qos; - - /** - * Whether the broker should retain the message or not. - *

- * Applies to: publish, subscribe - */ - @Nullable - @JsonProperty("retain") - @JsonPropertyDescription("Whether the broker should retain the message or not.") - private Boolean retain; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - *

- * Applies to: publish, subscribe - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerBinding.java deleted file mode 100644 index b574f05c..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerBinding.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.asyncapi.v2.binding.server.mqtt; - -import com.asyncapi.bindings.ServerBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes MQTT server binding. - *

- * Contains information about the server representation in MQTT. - * - * @version 0.1.0 - * @see MQTT server binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes MQTT server binding.") -public class MQTTServerBinding extends ServerBinding { - - /** - * The client identifier. - */ - @Nullable - @JsonProperty("clientId") - @JsonPropertyDescription("The client identifier.") - private String clientId; - - /** - * Whether to create a persisten connection or not. When false, the connection will be persistent. - */ - @Nullable - @JsonProperty("cleanSession") - @JsonPropertyDescription("Whether to create a persisten connection or not. When false, the connection will be persistent.") - private Boolean cleanSession; - - /** - * Last Will and Testament configuration. - */ - @Nullable - @JsonProperty("lastWill") - @JsonPropertyDescription("Last Will and Testament configuration.") - private MQTTServerLastWillConfiguration lastWill; - - /** - * Interval in seconds of the longest period of time the broker and the client can endure without sending a message. - */ - @Nullable - @JsonProperty("keepAlive") - @JsonPropertyDescription("Interval in seconds of the longest period of time the broker and the client can endure without sending a message.") - private Integer keepAlive; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerLastWillConfiguration.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerLastWillConfiguration.java deleted file mode 100644 index 5accb133..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mqtt/MQTTServerLastWillConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.asyncapi.v2.binding.server.mqtt; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes MQTT server last will configuration. - * - * @version 0.1.0 - * @see MQTT server binding - * @author Pavel Bodiachevskii - */ -@Data -@EqualsAndHashCode -@NoArgsConstructor -@AllArgsConstructor -public class MQTTServerLastWillConfiguration { - - /** - * The topic where the Last Will and Testament message will be sent. - */ - @Nullable - @JsonProperty("topic") - @JsonPropertyDescription("The topic where the Last Will and Testament message will be sent.") - private String topic; - - /** - * Defines how hard the broker/client will try to ensure that the Last Will and Testament message is received. - * Its value MUST be either 0, 1 or 2. - */ - @Nullable - @javax.validation.constraints.Min( - value = 0, - message = "QoS must be greater or equals to 0." - ) - @javax.validation.constraints.Max( - value = 2, - message = "QoS must be lower or equals to 0." - ) - @JsonProperty("qos") - @JsonPropertyDescription("Defines how hard the broker/client will try to ensure that the Last Will and Testament message is received. Its value MUST be either 0, 1 or 2.") - private Integer qos; - - /** - * Last Will message. - */ - @Nullable - @JsonProperty("message") - @JsonPropertyDescription("Last Will message.") - private String message; - - /** - * Whether the broker should retain the Last Will and Testament message or not. - */ - @Nullable - @JsonProperty("retain") - @JsonPropertyDescription("Whether the broker should retain the Last Will and Testament message or not.") - private Boolean retain; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index c23c0358..b8c56fb7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.v2.binding.server.jms.JMSServerBinding; import com.asyncapi.v2.binding.server.kafka.KafkaServerBinding; import com.asyncapi.v2.binding.server.mercure.MercureServerBinding; -import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index bef86ee6..9fb7ea73 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -10,8 +10,8 @@ import com.asyncapi.v2.binding.server.ibmmq.IBMMQServerBinding import com.asyncapi.v2.binding.server.jms.JMSServerBinding import com.asyncapi.v2.binding.server.kafka.KafkaServerBinding import com.asyncapi.v2.binding.server.mercure.MercureServerBinding -import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding -import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index e0305ae6..e8769a3b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -11,8 +11,8 @@ import com.asyncapi.v2.binding.server.ibmmq.IBMMQServerBinding import com.asyncapi.v2.binding.server.jms.JMSServerBinding import com.asyncapi.v2.binding.server.kafka.KafkaServerBinding import com.asyncapi.v2.binding.server.mercure.MercureServerBinding -import com.asyncapi.v2.binding.server.mqtt.MQTTServerBinding -import com.asyncapi.v2.binding.server.mqtt.MQTTServerLastWillConfiguration +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt/MQTTServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt/MQTTServerBindingTest.kt index de06a9eb..9dc23e49 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt/MQTTServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt/MQTTServerBindingTest.kt @@ -1,6 +1,8 @@ package com.asyncapi.v2.binding.server.mqtt import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration /** * @version 2.6.0 From 3d94ee282ba156821ce83e47adedcfb051d512ec Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 23 Apr 2024 01:26:58 +0400 Subject: [PATCH 020/141] feat(bindings): use common bindings https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/173 https://github.com/asyncapi/jasyncapi/issues/172 https://github.com/asyncapi/jasyncapi/issues/171 https://github.com/asyncapi/jasyncapi/issues/170 https://github.com/asyncapi/jasyncapi/issues/169 https://github.com/asyncapi/jasyncapi/issues/168 https://github.com/asyncapi/jasyncapi/issues/167 https://github.com/asyncapi/jasyncapi/issues/166 --- .../v0/_2_0/channel}/AMQPChannelBinding.java | 6 +- .../v0/_2_0/channel}/AMQPChannelType.java | 2 +- .../AMQPChannelExchangeProperties.java | 2 +- .../exchange/AMQPChannelExchangeType.java | 2 +- .../queue/AMQPChannelQueueProperties.java | 2 +- .../v0/_2_0/message}/AMQPMessageBinding.java | 2 +- .../_2_0/operation}/AMQPOperationBinding.java | 2 +- .../v0/_2_0/server}/AMQPServerBinding.java | 2 +- .../v0/_1_0/channel}/AMQP1ChannelBinding.java | 2 +- .../v0/_1_0/message}/AMQP1MessageBinding.java | 2 +- .../operation}/AMQP1OperationBinding.java | 2 +- .../v0/_1_0/server}/AMQP1ServerBinding.java | 2 +- .../channel}/AnypointMQChannelBinding.java | 2 +- .../AnypointMQChannelDestinationType.java | 2 +- .../message}/AnypointMQMessageBinding.java | 4 +- .../AnypointMQOperationBinding.java | 2 +- .../_0_1/server}/AnypointMQServerBinding.java | 2 +- .../channel}/GooglePubSubChannelBinding.java | 2 +- ...oglePubSubChannelMessageStoragePolicy.java | 2 +- .../GooglePubSubChannelSchemaSettings.java | 2 +- .../message}/GooglePubSubMessageBinding.java | 2 +- .../GooglePubSubMessageSchemaDefinition.java | 2 +- ...oglePubSubMessageSchemaDefinitionType.java | 2 +- .../GooglePubSubOperationBinding.java | 2 +- .../server}/GooglePubSubServerBinding.java | 2 +- .../v0/_1_0/channel}/HTTPChannelBinding.java | 2 +- .../v0/_1_0/message}/HTTPMessageBinding.java | 4 +- .../_1_0/operation}/HTTPOperationBinding.java | 4 +- .../_1_0/operation}/HTTPOperationMethod.java | 2 +- .../v0/_1_0/operation}/HTTPOperationType.java | 2 +- .../v0/_1_0/server}/HTTPServerBinding.java | 2 +- .../v0/_1_0/channel}/IBMMQChannelBinding.java | 2 +- .../channel}/IBMMQChannelDestinationType.java | 2 +- .../channel}/IBMMQChannelQueueProperties.java | 2 +- .../channel}/IBMMQChannelTopicProperties.java | 2 +- .../v0/_1_0/message}/IBMMQMessageBinding.java | 2 +- .../v0/_1_0/message}/IBMMQMessageType.java | 2 +- .../operation}/IBMMQOperationBinding.java | 2 +- .../v0/_1_0/server}/IBMMQServerBinding.java | 2 +- .../v0/_0_1/channel}/JMSChannelBinding.java | 2 +- .../v0/_0_1/message}/JMSMessageBinding.java | 2 +- .../_0_1/operation}/JMSOperationBinding.java | 2 +- .../jms/v0/_0_1/server}/JMSServerBinding.java | 2 +- .../v0/_4_0/channel}/KafkaChannelBinding.java | 2 +- .../KafkaChannelTopicCleanupPolicy.java | 2 +- .../KafkaChannelTopicConfiguration.java | 2 +- .../v0/_4_0/message}/KafkaMessageBinding.java | 4 +- .../KafkaMessageSchemaIdLocation.java | 2 +- .../operation}/KafkaOperationBinding.java | 4 +- .../v0/_4_0/server}/KafkaServerBinding.java | 2 +- .../_1_0/channel}/MercureChannelBinding.java | 2 +- .../_1_0/message}/MercureMessageBinding.java | 2 +- .../operation}/MercureOperationBinding.java | 2 +- .../v0/_1_0/server}/MercureServerBinding.java | 2 +- .../channel/amqp/AMQPChannelBinding.java | 66 - .../AMQPChannelExchangeProperties.java | 75 - .../exchange/AMQPChannelExchangeType.java | 33 - .../queue/AMQPChannelQueueProperties.java | 75 - .../anypointmq/AnypointMQChannelBinding.java | 62 - .../AnypointMQChannelDestinationType.java | 25 - .../GooglePubSubChannelBinding.java | 87 - ...oglePubSubChannelMessageStoragePolicy.java | 40 - .../GooglePubSubChannelSchemaSettings.java | 63 - .../channel/http/HTTPChannelBinding.java | 21 - .../channel/ibmmq/IBMMQChannelBinding.java | 92 - .../ibmmq/IBMMQChannelQueueProperties.java | 66 - .../ibmmq/IBMMQChannelTopicProperties.java | 78 - .../channel/kafka/KafkaChannelBinding.java | 80 - .../kafka/KafkaChannelTopicCleanupPolicy.java | 13 - .../mercure/MercureChannelBinding.java | 21 - .../message/amqp/AMQPMessageBinding.java | 56 - .../message/amqp1/AMQP1MessageBinding.java | 21 - .../anypointmq/AnypointMQMessageBinding.java | 49 - .../GooglePubSubMessageBinding.java | 66 - .../GooglePubSubMessageSchemaDefinition.java | 53 - ...oglePubSubMessageSchemaDefinitionType.java | 23 - .../message/http/HTTPMessageBinding.java | 48 - .../message/ibmmq/IBMMQMessageBinding.java | 93 - .../message/ibmmq/IBMMQMessageType.java | 25 - .../message/kafka/KafkaMessageBinding.java | 71 - .../kafka/KafkaMessageSchemaIdLocation.java | 20 - .../mercure/MercureMessageBinding.java | 21 - .../operation/amqp/AMQPOperationBinding.java | 154 - .../GooglePubSubOperationBinding.java | 21 - .../operation/http/HTTPOperationBinding.java | 70 - .../operation/http/HTTPOperationMethod.java | 22 - .../operation/http/HTTPOperationType.java | 13 - .../ibmmq/IBMMQOperationBinding.java | 23 - .../kafka/KafkaOperationBinding.java | 53 - .../mercure/MercureOperationBinding.java | 21 - .../server/amqp/AMQPServerBinding.java | 21 - .../anypointmq/AnypointMQServerBinding.java | 21 - .../GooglePubSubServerBinding.java | 21 - .../server/ibmmq/IBMMQServerBinding.java | 106 - .../server/kafka/KafkaServerBinding.java | 56 - .../server/mercure/MercureServerBinding.java | 21 - .../channel/ChannelBindingsDeserializer.java | 18 +- .../message/MessageBindingsDeserializer.java | 18 +- .../OperationBindingsDeserializer.java | 18 +- .../server/ServerBindingsDeserializer.java | 18 +- .../binding/channel/amqp/AMQPChannelType.java | 24 - .../channel/amqp1/AMQP1ChannelBinding.java | 21 - .../ibmmq/IBMMQChannelDestinationType.java | 20 - .../channel/jms/JMSChannelBinding.java | 21 - .../kafka/KafkaChannelTopicConfiguration.java | 83 - .../message/jms/JMSMessageBinding.java | 21 - .../amqp1/AMQP1OperationBinding.java | 21 - .../AnypointMQOperationBinding.java | 21 - .../operation/jms/JMSOperationBinding.java | 21 - .../server/amqp1/AMQP1ServerBinding.java | 21 - .../server/http/HTTPServerBinding.java | 21 - .../binding/server/jms/JMSServerBinding.java | 21 - .../channel/ChannelBindingsDeserializer.java | 18 +- .../message/MessageBindingsDeserializer.java | 18 +- .../OperationBindingsDeserializer.java | 18 +- .../server/ServerBindingsDeserializer.java | 18 +- .../examples/v2/_0_0/GitterStreaming.kt | 19 +- .../examples/v2/_0_0/OperationSecurity.kt | 6 +- .../asyncapi/examples/v2/_0_0/RpcClient.kt | 8 +- .../asyncapi/examples/v2/_0_0/RpcServer.kt | 8 +- .../examples/v2/_0_0/StreetlightsKafka.kt | 5 +- .../v2/_0_0/StreetlightsOperationSecurity.kt | 5 +- .../examples/v2/_6_0/GitterStreaming.kt | 13 +- .../com/asyncapi/examples/v2/_6_0/Mercure.kt | 3 - .../examples/v2/_6_0/OperationSecurity.kt | 6 +- .../asyncapi/examples/v2/_6_0/RpcClient.kt | 8 +- .../asyncapi/examples/v2/_6_0/RpcServer.kt | 8 +- .../examples/v2/_6_0/StreetlightsKafka.kt | 5 +- .../v2/_6_0/StreetlightsOperationSecurity.kt | 5 +- .../v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt | 10 +- .../v3/_0_0/GitterStreamingAsyncAPI.kt | 6 +- .../v3/_0_0/OperationSecurityAsyncAPI.kt | 4 +- .../examples/v3/_0_0/RpcClientAsyncAPI.kt | 8 +- .../examples/v3/_0_0/RpcServerAsyncAPI.kt | 8 +- .../v3/_0_0/StreetlightsKafkaAsyncAPI.kt | 2 +- .../StreetlightsOperationSecurityAsyncAPI.kt | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 8 +- .../_0_0/model/channel/message/MessageTest.kt | 6 +- .../model/channel/message/MessageTraitTest.kt | 6 +- .../model/channel/operation/OperationTest.kt | 12 +- .../channel/operation/OperationTraitTest.kt | 12 +- .../v2/_0_0/model/server/ServerTest.kt | 16 +- .../v2/_6_0/model/server/ServerTest.kt | 16 +- .../channel/amqp/AMQPChannelBindingTest.kt | 8 +- .../AnypointMQChannelBindingTest.kt | 2 + .../GooglePubSubChannelBindingTest.kt | 3 + .../channel/ibmmq/IBMMQChannelBindingTest.kt | 4 + .../channel/kafka/KafkaChannelBindingTest.kt | 3 + .../message/amqp/AMQPMessageBindingTest.kt | 1 + .../AnypointMQMessageBindingTest.kt | 7 +- .../GooglePubSubMessageBindingTest.kt | 3 + .../message/http/HTTPMessageBindingTest.kt | 7 +- .../message/ibmmq/IBMMQMessageBindingTest.kt | 2 + .../message/kafka/KafkaMessageBindingTest.kt | 6 +- .../amqp/AMQPOperationBindingTest.kt | 1 + .../http/HTTPOperationBindingTest.kt | 9 +- .../kafka/KafkaOperationBindingTest.kt | 7 +- .../server/ibmmq/IBMMQServerBindingTest.kt | 1 + .../server/kafka/KafkaServerBindingTest.kt | 1 + .../v3/_0_0/model/server/ServerTest.kt | 24 +- .../channel/amqp/AMQPChannelBindingTest.kt | 8 +- .../AnypointMQChannelBindingTest.kt | 2 + .../GooglePubSubChannelBindingTest.kt | 3 + .../channel/ibmmq/IBMMQChannelBindingTest.kt | 4 + .../channel/kafka/KafkaChannelBindingTest.kt | 3 + .../message/amqp/AMQPMessageBindingTest.kt | 1 + .../AnypointMQMessageBindingTest.kt | 1 + .../GooglePubSubMessageBindingTest.kt | 3 + .../message/http/HTTPMessageBindingTest.kt | 1 + .../message/ibmmq/IBMMQMessageBindingTest.kt | 2 + .../message/kafka/KafkaMessageBindingTest.kt | 2 + .../amqp/AMQPOperationBindingTest.kt | 1 + .../http/HTTPOperationBindingTest.kt | 3 + .../kafka/KafkaOperationBindingTest.kt | 1 + .../server/ibmmq/IBMMQServerBindingTest.kt | 1 + .../server/kafka/KafkaServerBindingTest.kt | 1 + .../v2/2.0.0/model/asyncapi - extended.json | 1490 +++++----- .../model/channel/channelItem - extended.json | 706 +++-- .../channel/message/message - extended.json | 170 +- .../message/messageTrait - extended.json | 170 +- .../operation with message - extended.json | 438 +-- ... with reference to message - extended.json | 268 +- .../operation/operationTrait - extended.json | 134 +- .../components/components - extended.json | 794 ++--- .../v2/2.6.0/model/asyncapi - extended.json | 2548 +++++++++-------- .../model/channel/channelItem - extended.json | 876 +++--- .../channel/message/message - extended.json | 170 +- .../message/messageTrait - extended.json | 170 +- .../operation with message - extended.json | 438 +-- ...eration with oneOf message - extended.json | 438 +-- ... with reference to message - extended.json | 268 +- .../operation/operationTrait - extended.json | 134 +- .../components/components - extended.json | 1658 ++++++----- .../anypointMQMessageBinding - extended.json | 68 +- .../http/httpMessageBinding - extended.json | 68 +- .../kafka/kafkaMessageBinding - extended.json | 34 +- .../http/httpOperationBinding - extended.json | 68 +- .../kafkaOperationBinding - extended.json | 66 +- 198 files changed, 6585 insertions(+), 7578 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/amqp => bindings/amqp/v0/_2_0/channel}/AMQPChannelBinding.java (89%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/amqp => bindings/amqp/v0/_2_0/channel}/AMQPChannelType.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/amqp => bindings/amqp/v0/_2_0/channel}/exchange/AMQPChannelExchangeProperties.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/amqp => bindings/amqp/v0/_2_0/channel}/exchange/AMQPChannelExchangeType.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/amqp => bindings/amqp/v0/_2_0/channel}/queue/AMQPChannelQueueProperties.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/amqp => bindings/amqp/v0/_2_0/message}/AMQPMessageBinding.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/amqp => bindings/amqp/v0/_2_0/operation}/AMQPOperationBinding.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/amqp => bindings/amqp/v0/_2_0/server}/AMQPServerBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/amqp1 => bindings/amqp1/v0/_1_0/channel}/AMQP1ChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/amqp1 => bindings/amqp1/v0/_1_0/message}/AMQP1MessageBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/operation/amqp1 => bindings/amqp1/v0/_1_0/operation}/AMQP1OperationBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/server/amqp1 => bindings/amqp1/v0/_1_0/server}/AMQP1ServerBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/anypointmq => bindings/anypointmq/v0/_0_1/channel}/AnypointMQChannelBinding.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/anypointmq => bindings/anypointmq/v0/_0_1/channel}/AnypointMQChannelDestinationType.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/anypointmq => bindings/anypointmq/v0/_0_1/message}/AnypointMQMessageBinding.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/operation/anypointmq => bindings/anypointmq/v0/_0_1/operation}/AnypointMQOperationBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/anypointmq => bindings/anypointmq/v0/_0_1/server}/AnypointMQServerBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/googlepubsub => bindings/googlepubsub/v0/_1_0/channel}/GooglePubSubChannelBinding.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/googlepubsub => bindings/googlepubsub/v0/_1_0/channel}/GooglePubSubChannelMessageStoragePolicy.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/googlepubsub => bindings/googlepubsub/v0/_1_0/channel}/GooglePubSubChannelSchemaSettings.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/googlepubsub => bindings/googlepubsub/v0/_1_0/message}/GooglePubSubMessageBinding.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/googlepubsub => bindings/googlepubsub/v0/_1_0/message}/GooglePubSubMessageSchemaDefinition.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/googlepubsub => bindings/googlepubsub/v0/_1_0/message}/GooglePubSubMessageSchemaDefinitionType.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/googlepubsub => bindings/googlepubsub/v0/_1_0/operation}/GooglePubSubOperationBinding.java (90%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/googlepubsub => bindings/googlepubsub/v0/_1_0/server}/GooglePubSubServerBinding.java (90%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/http => bindings/http/v0/_1_0/channel}/HTTPChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/http => bindings/http/v0/_1_0/message}/HTTPMessageBinding.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/http => bindings/http/v0/_1_0/operation}/HTTPOperationBinding.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/http => bindings/http/v0/_1_0/operation}/HTTPOperationMethod.java (88%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/http => bindings/http/v0/_1_0/operation}/HTTPOperationType.java (76%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/server/http => bindings/http/v0/_1_0/server}/HTTPServerBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/ibmmq => bindings/ibmmq/v0/_1_0/channel}/IBMMQChannelBinding.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/ibmmq => bindings/ibmmq/v0/_1_0/channel}/IBMMQChannelDestinationType.java (88%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/ibmmq => bindings/ibmmq/v0/_1_0/channel}/IBMMQChannelQueueProperties.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/ibmmq => bindings/ibmmq/v0/_1_0/channel}/IBMMQChannelTopicProperties.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/ibmmq => bindings/ibmmq/v0/_1_0/message}/IBMMQMessageBinding.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/ibmmq => bindings/ibmmq/v0/_1_0/message}/IBMMQMessageType.java (90%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/ibmmq => bindings/ibmmq/v0/_1_0/operation}/IBMMQOperationBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/ibmmq => bindings/ibmmq/v0/_1_0/server}/IBMMQServerBinding.java (99%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/jms => bindings/jms/v0/_0_1/channel}/JMSChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/message/jms => bindings/jms/v0/_0_1/message}/JMSMessageBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/operation/jms => bindings/jms/v0/_0_1/operation}/JMSOperationBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/server/jms => bindings/jms/v0/_0_1/server}/JMSServerBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/kafka => bindings/kafka/v0/_4_0/channel}/KafkaChannelBinding.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/kafka => bindings/kafka/v0/_4_0/channel}/KafkaChannelTopicCleanupPolicy.java (77%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/binding/channel/kafka => bindings/kafka/v0/_4_0/channel}/KafkaChannelTopicConfiguration.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/kafka => bindings/kafka/v0/_4_0/message}/KafkaMessageBinding.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/kafka => bindings/kafka/v0/_4_0/message}/KafkaMessageSchemaIdLocation.java (88%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/kafka => bindings/kafka/v0/_4_0/operation}/KafkaOperationBinding.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/kafka => bindings/kafka/v0/_4_0/server}/KafkaServerBinding.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/channel/mercure => bindings/mercure/v0/_1_0/channel}/MercureChannelBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/message/mercure => bindings/mercure/v0/_1_0/message}/MercureMessageBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/operation/mercure => bindings/mercure/v0/_1_0/operation}/MercureOperationBinding.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/binding/server/mercure => bindings/mercure/v0/_1_0/server}/MercureServerBinding.java (91%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/exchange/AMQPChannelExchangeProperties.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/exchange/AMQPChannelExchangeType.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/queue/AMQPChannelQueueProperties.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelDestinationType.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelMessageStoragePolicy.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelSchemaSettings.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/http/HTTPChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelQueueProperties.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelTopicProperties.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelTopicCleanupPolicy.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mercure/MercureChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp/AMQPMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp1/AMQP1MessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinition.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinitionType.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/http/HTTPMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageType.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageSchemaIdLocation.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mercure/MercureMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/googlepubsub/GooglePubSubOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationMethod.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationType.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ibmmq/IBMMQOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mercure/MercureOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp/AMQPServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/anypointmq/AnypointMQServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/googlepubsub/GooglePubSubServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/kafka/KafkaServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mercure/MercureServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelType.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp1/AMQP1ChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelDestinationType.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/jms/JMSChannelBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelTopicConfiguration.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/jms/JMSMessageBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp1/AMQP1OperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/anypointmq/AnypointMQOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/jms/JMSOperationBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp1/AMQP1ServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/http/HTTPServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/jms/JMSServerBinding.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java similarity index 89% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java index 6ae326b6..f25da590 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java @@ -1,8 +1,8 @@ -package com.asyncapi.v3.binding.channel.amqp; +package com.asyncapi.bindings.amqp.v0._2_0.channel; import com.asyncapi.bindings.ChannelBinding; -import com.asyncapi.v3.binding.channel.amqp.exchange.AMQPChannelExchangeProperties; -import com.asyncapi.v3.binding.channel.amqp.queue.AMQPChannelQueueProperties; +import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeProperties; +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelType.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelType.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelType.java index 82d13019..1dce3e40 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelType.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.amqp; +package com.asyncapi.bindings.amqp.v0._2_0.channel; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/exchange/AMQPChannelExchangeProperties.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java index 6c7b0465..4582c581 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/exchange/AMQPChannelExchangeProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.amqp.exchange; +package com.asyncapi.bindings.amqp.v0._2_0.channel.exchange; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/exchange/AMQPChannelExchangeType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeType.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/exchange/AMQPChannelExchangeType.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeType.java index 6a4211bc..4d9af396 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/exchange/AMQPChannelExchangeType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeType.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.amqp.exchange; +package com.asyncapi.bindings.amqp.v0._2_0.channel.exchange; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/queue/AMQPChannelQueueProperties.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java index 18f49c26..f31f3762 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/queue/AMQPChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.amqp.queue; +package com.asyncapi.bindings.amqp.v0._2_0.channel.queue; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp/AMQPMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java index 522d4d7f..0fcb70e8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.amqp; +package com.asyncapi.bindings.amqp.v0._2_0.message; import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java index b0366cda..54121114 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.amqp; +package com.asyncapi.bindings.amqp.v0._2_0.operation; import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp/AMQPServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java index 8dc97b20..a14af6ed 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp/AMQPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.amqp; +package com.asyncapi.bindings.amqp.v0._2_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp1/AMQP1ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp1/AMQP1ChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java index b4c0e4a6..61343b3f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp1/AMQP1ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.amqp1; +package com.asyncapi.bindings.amqp1.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp1/AMQP1MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp1/AMQP1MessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java index 5c497ea3..4bd1abb2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/amqp1/AMQP1MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.amqp1; +package com.asyncapi.bindings.amqp1.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp1/AMQP1OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp1/AMQP1OperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java index 9367cebb..06754e31 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp1/AMQP1OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.operation.amqp1; +package com.asyncapi.bindings.amqp1.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp1/AMQP1ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp1/AMQP1ServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java index 3b870fef..81852516 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp1/AMQP1ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.server.amqp1; +package com.asyncapi.bindings.amqp1.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java index 1835f6af..eb682d22 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.anypointmq; +package com.asyncapi.bindings.anypointmq.v0._0_1.channel; import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelDestinationType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelDestinationType.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelDestinationType.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelDestinationType.java index 3f42233c..fb5c5977 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelDestinationType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelDestinationType.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.anypointmq; +package com.asyncapi.bindings.anypointmq.v0._0_1.channel; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java index e7a69598..fa9a3808 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java @@ -1,7 +1,7 @@ -package com.asyncapi.v3.binding.message.anypointmq; +package com.asyncapi.bindings.anypointmq.v0._0_1.message; -import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.bindings.MessageBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/anypointmq/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/anypointmq/AnypointMQOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java index 16329ba8..b7b71bd1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/anypointmq/AnypointMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.operation.anypointmq; +package com.asyncapi.bindings.anypointmq.v0._0_1.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/anypointmq/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/anypointmq/AnypointMQServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java index a74ed0c0..bf661903 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/anypointmq/AnypointMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.anypointmq; +package com.asyncapi.bindings.anypointmq.v0._0_1.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java index 3627e2c8..23205a95 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.googlepubsub; +package com.asyncapi.bindings.googlepubsub.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelMessageStoragePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelMessageStoragePolicy.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java index 2f236cc6..a76810a9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelMessageStoragePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.googlepubsub; +package com.asyncapi.bindings.googlepubsub.v0._1_0.channel; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelSchemaSettings.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelSchemaSettings.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java index ce5f807e..2d642c0d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelSchemaSettings.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.googlepubsub; +package com.asyncapi.bindings.googlepubsub.v0._1_0.channel; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java index e55a7abc..478765c9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.googlepubsub; +package com.asyncapi.bindings.googlepubsub.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinition.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java index 277061b3..f0644327 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinition.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.googlepubsub; +package com.asyncapi.bindings.googlepubsub.v0._1_0.message; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinitionType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinitionType.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinitionType.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinitionType.java index f7dd4bc3..8528bc4c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinitionType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinitionType.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.googlepubsub; +package com.asyncapi.bindings.googlepubsub.v0._1_0.message; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/googlepubsub/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java similarity index 90% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/googlepubsub/GooglePubSubOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java index df00b9fc..a7f7dabe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/googlepubsub/GooglePubSubOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.googlepubsub; +package com.asyncapi.bindings.googlepubsub.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/googlepubsub/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java similarity index 90% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/googlepubsub/GooglePubSubServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java index 5ac8ff3e..6919a62a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/googlepubsub/GooglePubSubServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.googlepubsub; +package com.asyncapi.bindings.googlepubsub.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/http/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/http/HTTPChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java index 7a62e532..f06a46a6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/http/HTTPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.http; +package com.asyncapi.bindings.http.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/http/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/http/HTTPMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java index 04026bc4..ab718288 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/http/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java @@ -1,7 +1,7 @@ -package com.asyncapi.v3.binding.message.http; +package com.asyncapi.bindings.http.v0._1_0.message; -import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.bindings.MessageBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java index cad52b85..ac866c5f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java @@ -1,7 +1,7 @@ -package com.asyncapi.v3.binding.operation.http; +package com.asyncapi.bindings.http.v0._1_0.operation; -import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.bindings.OperationBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationMethod.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationMethod.java similarity index 88% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationMethod.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationMethod.java index d71ddf2a..bb7b2f89 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationMethod.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationMethod.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.http; +package com.asyncapi.bindings.http.v0._1_0.operation; /** * Describes HTTP operation type. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationType.java similarity index 76% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationType.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationType.java index 0c7d5031..7c5a5fad 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/http/HTTPOperationType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationType.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.http; +package com.asyncapi.bindings.http.v0._1_0.operation; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/http/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/http/HTTPServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java index fb9370ee..269924f4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/http/HTTPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.server.http; +package com.asyncapi.bindings.http.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java index 8db81af6..ecfd1be3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.ibmmq; +package com.asyncapi.bindings.ibmmq.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelDestinationType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelDestinationType.java similarity index 88% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelDestinationType.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelDestinationType.java index 7b0d7058..5afd6eb6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelDestinationType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelDestinationType.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.ibmmq; +package com.asyncapi.bindings.ibmmq.v0._1_0.channel; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelQueueProperties.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java index 4c4586ab..c5525d55 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.ibmmq; +package com.asyncapi.bindings.ibmmq.v0._1_0.channel; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelTopicProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelTopicProperties.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java index 7fe8544e..4374a731 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelTopicProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.ibmmq; +package com.asyncapi.bindings.ibmmq.v0._1_0.channel; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java index 2dd7723d..ee6730ef 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.ibmmq; +package com.asyncapi.bindings.ibmmq.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageType.java similarity index 90% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageType.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageType.java index 171f8a2f..5d09d9d3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageType.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.ibmmq; +package com.asyncapi.bindings.ibmmq.v0._1_0.message; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ibmmq/IBMMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ibmmq/IBMMQOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java index 34bd52c3..c72a96d4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/ibmmq/IBMMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.ibmmq; +package com.asyncapi.bindings.ibmmq.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java similarity index 99% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java index 98f649f2..c965fd4c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.ibmmq; +package com.asyncapi.bindings.ibmmq.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/jms/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/jms/JMSChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java index b69941e5..44b84837 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/jms/JMSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.jms; +package com.asyncapi.bindings.jms.v0._0_1.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/jms/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/jms/JMSMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java index b0912337..68a27cf8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/jms/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.message.jms; +package com.asyncapi.bindings.jms.v0._0_1.message; import com.asyncapi.bindings.MessageBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/jms/JMSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/jms/JMSOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java index aa3fd27a..42242e3e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/jms/JMSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.operation.jms; +package com.asyncapi.bindings.jms.v0._0_1.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/jms/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/jms/JMSServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java index ed9d2ba4..5adbb792 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/jms/JMSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.server.jms; +package com.asyncapi.bindings.jms.v0._0_1.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java index a0eb4170..9b6b2909 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.kafka; +package com.asyncapi.bindings.kafka.v0._4_0.channel; import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelTopicCleanupPolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelTopicCleanupPolicy.java similarity index 77% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelTopicCleanupPolicy.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelTopicCleanupPolicy.java index a58e764a..814aca64 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelTopicCleanupPolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelTopicCleanupPolicy.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.kafka; +package com.asyncapi.bindings.kafka.v0._4_0.channel; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelTopicConfiguration.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelTopicConfiguration.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelTopicConfiguration.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelTopicConfiguration.java index 0e49c527..44fb919f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelTopicConfiguration.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelTopicConfiguration.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.binding.channel.kafka; +package com.asyncapi.bindings.kafka.v0._4_0.channel; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java index d7e9522a..cc3d7633 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java @@ -1,7 +1,7 @@ -package com.asyncapi.v3.binding.message.kafka; +package com.asyncapi.bindings.kafka.v0._4_0.message; -import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.bindings.MessageBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageSchemaIdLocation.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageSchemaIdLocation.java similarity index 88% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageSchemaIdLocation.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageSchemaIdLocation.java index e0a16f88..d4b59df9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/kafka/KafkaMessageSchemaIdLocation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageSchemaIdLocation.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.kafka; +package com.asyncapi.bindings.kafka.v0._4_0.message; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java index 8eee6301..74999426 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java @@ -1,7 +1,7 @@ -package com.asyncapi.v3.binding.operation.kafka; +package com.asyncapi.bindings.kafka.v0._4_0.operation; -import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.bindings.OperationBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/kafka/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/kafka/KafkaServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java index ae2a98c0..1e9fd2d6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/kafka/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.kafka; +package com.asyncapi.bindings.kafka.v0._4_0.server; import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mercure/MercureChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mercure/MercureChannelBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java index eec421c9..d92a1832 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/mercure/MercureChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.channel.mercure; +package com.asyncapi.bindings.mercure.v0._1_0.channel; import com.asyncapi.bindings.ChannelBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mercure/MercureMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mercure/MercureMessageBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java index 841dc992..c765b2d8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/mercure/MercureMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.message.mercure; +package com.asyncapi.bindings.mercure.v0._1_0.message; import com.asyncapi.bindings.MessageBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mercure/MercureOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mercure/MercureOperationBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java index b77585d3..fe3907b7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/mercure/MercureOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.operation.mercure; +package com.asyncapi.bindings.mercure.v0._1_0.operation; import com.asyncapi.bindings.OperationBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mercure/MercureServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mercure/MercureServerBinding.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java index 2827dc22..20921b2c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/mercure/MercureServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.binding.server.mercure; +package com.asyncapi.bindings.mercure.v0._1_0.server; import com.asyncapi.bindings.ServerBinding; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBinding.java deleted file mode 100644 index 7ba11be3..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBinding.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.asyncapi.v2.binding.channel.amqp; - -import com.asyncapi.bindings.ChannelBinding; -import com.asyncapi.v2.binding.channel.amqp.exchange.AMQPChannelExchangeProperties; -import com.asyncapi.v2.binding.channel.amqp.queue.AMQPChannelQueueProperties; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * Describes AMQP 0-9-1 channel binding. - *

- * Contains information about the channel representation in AMQP. - * - * @version 0.2.0 - * @see AMQP channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes AMQP 0-9-1 channel binding.") -public class AMQPChannelBinding extends ChannelBinding { - - /** - * Defines what type of channel is it. Can be either queue or routingKey (default). - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty(value = "is", required = true, defaultValue = "routingKey") - @JsonPropertyDescription("Defines what type of channel is it. Can be either queue or routingKey (default).") - private AMQPChannelType is = AMQPChannelType.ROUTING_KEY; - - /** - * When is=routingKey, this object defines the exchange properties. - */ - @Nullable - @JsonProperty("exchange") - @JsonPropertyDescription("When is=routingKey, this object defines the exchange properties.") - private AMQPChannelExchangeProperties exchange; - - /** - * When is=queue, this object defines the queue properties. - */ - @Nullable - @JsonProperty("queue") - @JsonPropertyDescription("When is=queue, this object defines the queue properties.") - private AMQPChannelQueueProperties queue; - - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private final String bindingVersion = "0.2.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/exchange/AMQPChannelExchangeProperties.java deleted file mode 100644 index 6b07844d..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/exchange/AMQPChannelExchangeProperties.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.asyncapi.v2.binding.channel.amqp.exchange; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes AMQP 0-9-1 channel exchange properties. - *

- * Contains information about the channel exchange properties in AMQP. - * - * @version 0.2.0 - * @see AMQP channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -@JsonClassDescription("Describes AMQP 0-9-1 channel exchange properties.") -public class AMQPChannelExchangeProperties { - - /** - * The name of the exchange. It MUST NOT exceed 255 characters long. - */ - @Nullable - @javax.validation.constraints.Size( - max = 255, - message = "Exchange name must not exceed 255 characters long." - ) - @JsonProperty("name") - @JsonPropertyDescription("The name of the exchange. It MUST NOT exceed 255 characters long.") - private String name; - - /** - * The type of the exchange. Can be either topic, direct, fanout, default or headers. - */ - @Nullable - @JsonProperty("type") - @JsonPropertyDescription("The type of the exchange. Can be either topic, direct, fanout, default or headers.") - private AMQPChannelExchangeType type; - - /** - * Whether the exchange should survive broker restarts or not. - */ - @Nullable - @JsonProperty("durable") - @JsonPropertyDescription("Whether the exchange should survive broker restarts or not.") - private Boolean durable; - - /** - * Whether the exchange should be deleted when the last queue is unbound from it. - */ - @Nullable - @JsonProperty("autoDelete") - @JsonPropertyDescription("Whether the exchange should be deleted when the last queue is unbound from it.") - private Boolean autoDelete; - - /** - * The virtual host of the exchange. Defaults to /. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "vhost", defaultValue = "/") - @JsonPropertyDescription("The virtual host of the exchange. Defaults to /.") - private String vhost = "/"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/exchange/AMQPChannelExchangeType.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/exchange/AMQPChannelExchangeType.java deleted file mode 100644 index 373cff20..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/exchange/AMQPChannelExchangeType.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.asyncapi.v2.binding.channel.amqp.exchange; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes AMQP 0-9-1 channel exchange type. - *

- * Contains information about the channel exchange type in AMQP. - * - * @version 0.2.0 - * @see AMQP channel binding - * @author Pavel Bodiachevskii - */ -@JsonClassDescription("Describes AMQP 0-9-1 channel exchange type.") -public enum AMQPChannelExchangeType { - - @JsonProperty("topic") - TOPIC, - - @JsonProperty("direct") - DIRECT, - - @JsonProperty("fanout") - FANOUT, - - @JsonProperty("default") - DEFAULT, - - @JsonProperty("headers") - HEADERS - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/queue/AMQPChannelQueueProperties.java deleted file mode 100644 index f3a1e09c..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/amqp/queue/AMQPChannelQueueProperties.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.asyncapi.v2.binding.channel.amqp.queue; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes AMQP 0-9-1 channel queue properties. - *

- * Contains information about the queue exchange properties in AMQP. - * - * @version 0.2.0 - * @see AMQP channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -@JsonClassDescription("Describes AMQP 0-9-1 channel queue properties.") -public class AMQPChannelQueueProperties { - - /** - * The name of the queue. It MUST NOT exceed 255 characters long. - */ - @Nullable - @javax.validation.constraints.Size( - max = 255, - message = "Queue name must not exceed 255 characters long." - ) - @JsonProperty("name") - @JsonPropertyDescription("The name of the queue. It MUST NOT exceed 255 characters long.") - private String name; - - /** - * Whether the queue should survive broker restarts or not. - */ - @Nullable - @JsonProperty("durable") - @JsonPropertyDescription("Whether the queue should survive broker restarts or not.") - private Boolean durable; - - /** - * Whether the queue should be used only by one connection or not. - */ - @Nullable - @JsonProperty("exclusive") - @JsonPropertyDescription("Whether the queue should be used only by one connection or not.") - private Boolean exclusive; - - /** - * Whether the queue should be deleted when the last consumer unsubscribes. - */ - @Nullable - @JsonProperty("autoDelete") - @JsonPropertyDescription("Whether the queue should be deleted when the last consumer unsubscribes.") - private Boolean autoDelete; - - /** - * The virtual host of the queue. Defaults to /. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "vhost", defaultValue = "/") - @JsonPropertyDescription("The virtual host of the queue. Defaults to /.") - private String vhost = "/"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBinding.java deleted file mode 100644 index 561ffb07..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBinding.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.asyncapi.v2.binding.channel.anypointmq; - -import com.asyncapi.bindings.ChannelBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Anypoint MQ channel binding. - * - * @version 0.0.1 - * @see Anypoint MQ channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Anypoint MQ channel binding.") -public class AnypointMQChannelBinding extends ChannelBinding { - - /** - * OPTIONAL, defaults to the channel name. - *

- * The destination (queue or exchange) name for this channel. SHOULD only be specified if the channel name differs - * from the actual destination name, such as when the channel name is not a valid destination name in Anypoint MQ. - */ - @Nullable - @JsonProperty("destination") - @JsonPropertyDescription("The destination (queue or exchange) name for this channel. SHOULD only be specified if the channel name differs from the actual destination name, such as when the channel name is not a valid destination name in Anypoint MQ.") - private String destination; - - /** - * OPTIONAL, defaults to queue. - *

- * The type of destination, which MUST be either exchange or queue or fifo-queue. - * SHOULD be specified to document the messaging model (publish/subscribe, point-to-point, strict message ordering) - * supported by this channel. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "destinationType", defaultValue = "queue") - @JsonPropertyDescription("The type of destination, which MUST be either exchange or queue or fifo-queue. SHOULD be specified to document the messaging model (publish/subscribe, point-to-point, strict message ordering) supported by this channel.") - private AnypointMQChannelDestinationType destinationType = AnypointMQChannelDestinationType.QUEUE; - - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.0.1"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelDestinationType.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelDestinationType.java deleted file mode 100644 index 0571f156..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelDestinationType.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.asyncapi.v2.binding.channel.anypointmq; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes Anypoint MQ channel destination type. - * - * @version 0.0.1 - * @see Anypoint MQ channel binding - * @author Pavel Bodiachevskii - */ -@JsonClassDescription("Describes Anypoint MQ channel destination type.") -public enum AnypointMQChannelDestinationType { - - @JsonProperty("exchange") - EXCHANGE, - - @JsonProperty("queue") - QUEUE, - - @JsonProperty("fifo-queue") - FIFO_QUEUE - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBinding.java deleted file mode 100644 index 7a19e514..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBinding.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.asyncapi.v2.binding.channel.googlepubsub; - -import com.asyncapi.bindings.ChannelBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Map; - -/** - * Describes Google Cloud Pub/Sub channel binding. - *

- * The Channel Bindings Object is used to describe the Google Cloud Pub/Sub specific Topic details with AsyncAPI. - * - * @version 0.1.0 - * @see Google Cloud Pub/Sub channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Google Cloud Pub/Sub channel binding.") -public class GooglePubSubChannelBinding extends ChannelBinding { - - /** - * The Google Cloud Pub/Sub Topic name. - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty(value = "topic", required = true) - @JsonPropertyDescription("The Google Cloud Pub/Sub Topic name.") - private String topic = ""; - - /** - * An object of key-value pairs (These are used to categorize Cloud Resources like Cloud Pub/Sub Topics.) - */ - @Nullable - @JsonProperty("labels") - @JsonPropertyDescription("An object of key-value pairs (These are used to categorize Cloud Resources like Cloud Pub/Sub Topics.)") - private Map labels; - - /** - * Indicates the minimum duration to retain a message after it is published to the topic (Must be a valid Duration.) - */ - @Nullable - @JsonProperty("messageRetentionDuration") - @JsonPropertyDescription("Indicates the minimum duration to retain a message after it is published to the topic (Must be a valid https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Duration.)") - private String messageRetentionDuration; - - /** - * Policy constraining the set of Google Cloud Platform regions where messages published to the topic may be stored - */ - @Nullable - @JsonProperty("messageStoragePolicy") - @JsonPropertyDescription("Policy constraining the set of Google Cloud Platform regions where messages published to the topic may be stored") - private GooglePubSubChannelMessageStoragePolicy messageStoragePolicy; - - /** - * Settings for validating messages published against a schema - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty(value = "schemaSettings", required = true) - @JsonPropertyDescription("Settings for validating messages published against a schema") - private GooglePubSubChannelSchemaSettings schemaSettings = new GooglePubSubChannelSchemaSettings(); - - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelMessageStoragePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelMessageStoragePolicy.java deleted file mode 100644 index 9e988335..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelMessageStoragePolicy.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.v2.binding.channel.googlepubsub; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -/** - * Describes Google Cloud Pub/Sub MessageStoragePolicy. - *

- * The Message Storage Policy Object is used to describe the Google Cloud Pub/Sub MessageStoragePolicy Object with AsyncAPI. - * - * @version 0.1.0 - * @see Google Cloud Pub/Sub channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -@JsonClassDescription("Describe the Google Cloud Pub/Sub MessageStoragePolicy") -public class GooglePubSubChannelMessageStoragePolicy { - - /** - * A list of IDs of GCP regions where messages that are published to the topic may be persisted in storage - */ - @Nullable - @JsonProperty("allowedPersistenceRegions") - @JsonPropertyDescription("A list of IDs of GCP regions where messages that are published to the topic may be persisted in storage") - private List allowedPersistenceRegions; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelSchemaSettings.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelSchemaSettings.java deleted file mode 100644 index 76e0fa79..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelSchemaSettings.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.asyncapi.v2.binding.channel.googlepubsub; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Google Cloud Pub/Sub SchemaSettings. - *

- * The Schema Settings Object is used to describe the Google Cloud Pub/Sub SchemaSettings Object with AsyncAPI. - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -@JsonClassDescription("Describe the Google Cloud Pub/Sub SchemaSettings") -public class GooglePubSubChannelSchemaSettings { - - /** - * The encoding of the message (Must be one of the possible Encoding values.) - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty(value = "encoding", required = true) - @JsonPropertyDescription("The encoding of the message (Must be one of the possible https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics#encoding values.)") - private String encoding = ""; - - /** - * The minimum (inclusive) revision allowed for validating messages - */ - @Nullable - @JsonProperty("firstRevisionId") - @JsonPropertyDescription("The minimum (inclusive) revision allowed for validating messages") - private String firstRevisionId; - - /** - * The maximum (inclusive) revision allowed for validating messages - */ - @Nullable - @JsonProperty("lastRevisionId") - @JsonPropertyDescription("The maximum (inclusive) revision allowed for validating messages") - private String lastRevisionId; - - /** - * The name of the schema that messages published should be validated against (The format is projects/{project}/schemas/{schema}.) - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty(value = "name", required = true) - @JsonPropertyDescription("The name of the schema that messages published should be validated against (The format is projects/{project}/schemas/{schema}.)") - private String name = ""; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/http/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/http/HTTPChannelBinding.java deleted file mode 100644 index d1235b6b..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/http/HTTPChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.channel.http; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes HTTP channel binding. - * - * @version 0.1.0 - * @see HTTP channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class HTTPChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBinding.java deleted file mode 100644 index 82cb4f43..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBinding.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.asyncapi.v2.binding.channel.ibmmq; - -import com.asyncapi.bindings.ChannelBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes IBM MQ channel binding. - *

- * This object contains information about the channel representation in IBM MQ. Each channel corresponds to a Queue or Topic within IBM MQ. - * - * @version 0.1.0 - * @see IBM MQ channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes IBM MQ channel binding.") -public class IBMMQChannelBinding extends ChannelBinding { - - /** - * Defines the type of AsyncAPI channel. - *

- * MUST be either topic or queue. For type topic, the AsyncAPI channel name MUST be assumed for the IBM MQ topic string unless overridden. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "destinationType", defaultValue = "topic") - @JsonPropertyDescription("Defines the type of AsyncAPI channel.") - private IBMMQChannelDestinationType destinationType = IBMMQChannelDestinationType.TOPIC; - - /** - * REQUIRED if destinationType = queue - *

- * queue and topic fields MUST NOT coexist within a channel binding - */ - @Nullable - @JsonProperty("queue") - @JsonPropertyDescription("Defines the properties of a queue.") - private IBMMQChannelQueueProperties queue; - - /** - * Defines the properties of a topic. - *

- * OPTIONAL if destinationType = topic - *

- * queue and topic fields MUST NOT coexist within a channel binding. - */ - @Nullable - @JsonProperty("topic") - @JsonPropertyDescription("Defines the properties of a topic.") - private IBMMQChannelTopicProperties topic; - - /** - * The maximum length of the physical message (in bytes) accepted by the Topic or Queue. Messages produced that are - * greater in size than this value may fail to be delivered. More information on the maximum message length can be - * found on this page in the IBM MQ Knowledge Center. - *

- * MUST be 0-104,857,600 bytes (100 MB). - */ - @Nullable - @javax.validation.constraints.Min( - value = 0, - message = "Maximum length of the physical message (in bytes) must be greater or equals to 0" - ) - @javax.validation.constraints.Max( - value = 104857600, - message = "Maximum length of the physical message (in bytes) must be lower or equals to 104857600" - ) - @JsonProperty("maxMsgLength") - @JsonPropertyDescription("The maximum length of the physical message (in bytes) accepted by the Topic or Queue. Messages produced that are greater in size than this value may fail to be delivered. More information on the maximum message length can be found on this [page](https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.ref.dev.doc/q097520_.html) in the IBM MQ Knowledge Center.") - private Integer maxMsgLength; - - /** - * The version of this binding. - */ - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelQueueProperties.java deleted file mode 100644 index fa06b6a2..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelQueueProperties.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.asyncapi.v2.binding.channel.ibmmq; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * Describes IBM MQ channel queue properties. - * - * @version 0.1.0 - * @see IBM MQ channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -@JsonClassDescription("Describes IBM MQ channel queue properties.") -public class IBMMQChannelQueueProperties { - - /** - * Defines the name of the IBM MQ queue associated with the channel. - *

- * A value MUST be specified. MUST NOT exceed 48 characters in length. MUST be a valid IBM MQ queue name - */ - @NotNull - @javax.validation.constraints.NotNull - @javax.validation.constraints.Size( - max = 48, - message = "Name of the IBM MQ queue must be less or equals to 48" - ) - @Builder.Default - @JsonProperty("objectName") - @JsonPropertyDescription("Defines the name of the IBM MQ queue associated with the channel.") - private String objectName = ""; - - /** - * Defines if the queue is a cluster queue and therefore partitioned. If true, a binding option MAY be specified - * when accessing the queue. More information on binding options can be found on this page in the IBM MQ Knowledge Center. - *

- * If false, binding options SHOULD NOT be specified when accessing the queue. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "isPartitioned", defaultValue = "false") - @JsonPropertyDescription("Defines if the queue is a cluster queue and therefore partitioned. If 'true', a binding option MAY be specified when accessing the queue. More information on binding options can be found on this page in the IBM MQ Knowledge Center.") - private Boolean isPartitioned = false; - - /** - * Specifies if it is recommended to open the queue exclusively. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "exclusive", defaultValue = "false") - @JsonPropertyDescription("Specifies if it is recommended to open the queue exclusively.") - private Boolean exclusive = false; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelTopicProperties.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelTopicProperties.java deleted file mode 100644 index 7d3b54b4..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelTopicProperties.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.asyncapi.v2.binding.channel.ibmmq; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes IBM MQ channel topic properties. - * - * @version 0.1.0 - * @see IBM MQ channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -public class IBMMQChannelTopicProperties { - - /** - * The value of the IBM MQ topic string to be used. - *

- * OPTIONAL - * Note: if specified, SHALL override AsyncAPI channel name. - *

- * MUST NOT exceed 10240 characters in length. MAY coexist with topic.objectName - */ - @Nullable - @javax.validation.constraints.Max( - value = 10240, - message = "Maximum length of topic string must be lower or equals to 10240" - ) - @JsonProperty("string") - @JsonPropertyDescription("The value of the IBM MQ topic string to be used.") - private String string; - - /** - * The name of the IBM MQ topic object. - *

- * OPTIONAL - * Note: if specified, SHALL override AsyncAPI channel name. - *

- * MUST NOT exceed 48 characters in length. MAY coexist with topic.string - */ - @Nullable - @javax.validation.constraints.Max( - value = 48, - message = "Maximum length of topic name must be lower or equals to 48" - ) - @JsonProperty("objectName") - @JsonPropertyDescription("The name of the IBM MQ topic object.") - private String objectName; - - /** - * Defines if the subscription may be durable. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "durablePermitted", defaultValue = "true") - @JsonPropertyDescription("Defines if the subscription may be durable.") - private Boolean durablePermitted = true; - - /** - * Defines if the last message published will be made available to new subscriptions. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "lastMsgRetained", defaultValue = "false") - @JsonPropertyDescription("Defines if the last message published will be made available to new subscriptions.") - private Boolean lastMsgRetained = false; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBinding.java deleted file mode 100644 index 3ed799ce..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBinding.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.asyncapi.v2.binding.channel.kafka; - -import com.asyncapi.bindings.ChannelBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Kafka channel binding. - * - * @version 0.4.0 - * @see Kafka channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Kafka channel binding.") -public class KafkaChannelBinding extends ChannelBinding { - - /** - * Kafka topic name if different from channel name. - */ - @Nullable - @JsonProperty("topic") - @JsonPropertyDescription("Kafka topic name if different from channel name.") - private String topic; - - /** - * Number of partitions configured on this topic (useful to know how many parallel consumers you may run). - *

- * MUST be positive. - */ - @Nullable - @javax.validation.constraints.Min( - value = 1, - message = "Number of partitions must be greater or equals to 1" - ) - @JsonProperty("partitions") - @JsonPropertyDescription("Number of partitions configured on this topic (useful to know how many parallel consumers you may run).") - private Integer partitions; - - /** - * Number of replicas configured on this topic. - *

- * MUST be positive. - */ - @Nullable - @javax.validation.constraints.Min( - value = 1, - message = "Number of replicas must be greater or equals to 1" - ) - @JsonProperty("replicas") - @JsonPropertyDescription("Number of replicas configured on this topic.") - private Integer replicas; - - /** - * Topic configuration properties that are relevant for the API. - */ - @Nullable - @JsonProperty("topicConfiguration") - @JsonPropertyDescription("Topic configuration properties that are relevant for the API.") - private KafkaChannelTopicConfiguration topicConfiguration; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - private String bindingVersion = "0.4.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelTopicCleanupPolicy.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelTopicCleanupPolicy.java deleted file mode 100644 index 06fe5aa2..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/kafka/KafkaChannelTopicCleanupPolicy.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.asyncapi.v2.binding.channel.kafka; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public enum KafkaChannelTopicCleanupPolicy { - - @JsonProperty("compact") - COMPACT, - - @JsonProperty("delete") - DELETE - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mercure/MercureChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mercure/MercureChannelBinding.java deleted file mode 100644 index 68bf5dc7..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/channel/mercure/MercureChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.channel.mercure; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Mercure channel binding. - * - * @version 0.1.0 - * @see Mercure channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MercureChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp/AMQPMessageBinding.java deleted file mode 100644 index 879bc956..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp/AMQPMessageBinding.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.asyncapi.v2.binding.message.amqp; - -import com.asyncapi.bindings.MessageBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes AMQP 0-9-1 message binding. - *

- * Contains information about the message representation in AMQP. - * - * @version 0.2.0 - * @see AMQP message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes AMQP 0-9-1 message binding.") -public class AMQPMessageBinding extends MessageBinding { - - /** - * A MIME encoding for the message content. - */ - @Nullable - @JsonProperty("contentEncoding") - @JsonPropertyDescription("A MIME encoding for the message content.") - private String contentEncoding; - - /** - * Application-specific message type. - */ - @Nullable - @JsonProperty("messageType") - @JsonPropertyDescription("Application-specific message type.") - private String messageType; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.2.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp1/AMQP1MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp1/AMQP1MessageBinding.java deleted file mode 100644 index f71badf4..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/amqp1/AMQP1MessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.message.amqp1; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes AMQP 1.0 message binding. - * - * @version 0.1.0 - * @see AMQP message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class AMQP1MessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBinding.java deleted file mode 100644 index 693ca604..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBinding.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.asyncapi.v2.binding.message.anypointmq; - -import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v2.schema.Schema; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Anypoint MQ message binding. - * - * @version 0.0.1 - * @see Anypoint MQ message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Anypoint MQ message binding.") -public class AnypointMQMessageBinding extends MessageBinding { - - /** - * A Schema object containing the definitions for Anypoint MQ-specific headers (so-called protocol headers). - * This schema MUST be of type object and have a properties key. Examples of Anypoint MQ protocol headers are - * messageId and messageGroupId. - */ - @Nullable - @JsonProperty("headers") - @JsonPropertyDescription("A Schema object containing the definitions for Anypoint MQ-specific headers (so-called protocol headers). This schema MUST be of type object and have a properties key. Examples of Anypoint MQ protocol headers are messageId and messageGroupId.") - private Schema headers; - - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.0.1"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBinding.java deleted file mode 100644 index d0ad072b..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBinding.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.asyncapi.v2.binding.message.googlepubsub; - -import com.asyncapi.bindings.MessageBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Google Cloud Pub/Sub message binding. - *

- * The Message Binding Object is used to describe the Google Cloud Pub/Sub specific PubsubMessage details, alongside with - * pertintent parts of the Google Cloud Pub/Sub Schema Object, with AsyncAPI. - * - * @version 0.1.0 - * @see Google Cloud Pub/Sub message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Google Cloud Pub/Sub message binding.") -public class GooglePubSubMessageBinding extends MessageBinding { - - /** - * If non-empty, identifies related messages for which publish order should be respected (For more information, see ordering messages.) - */ - @Nullable - @JsonProperty("orderingKey") - @JsonPropertyDescription("If non-empty, identifies related messages for which publish order should be respected (For more information, see https://cloud.google.com/pubsub/docs/ordering messages") - private String orderingKey; - - /** - * Attributes for this message (If this field is empty, the message must contain non-empty data. This can be used to - * filter messages on the subscription.) - */ - @Nullable - @JsonProperty("attributes") - @JsonPropertyDescription("Attributes for this message (If this field is empty, the message must contain non-empty data. This can be used to filter messages on the subscription.)") - private Object attributes; - - /** - * Describes the schema used to validate the payload of this message - */ - @Nullable - @JsonProperty("schema") - @JsonPropertyDescription("Describes the schema used to validate the payload of this message") - private GooglePubSubMessageSchemaDefinition schema; - - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinition.java deleted file mode 100644 index 2f70c8ac..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinition.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.asyncapi.v2.binding.message.googlepubsub; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; - -/** - * Describes Google Cloud Pub/Sub message schema definition. - *

- * The Schema Definition Object is used to describe the Google Cloud Pub/Sub Schema Object with AsyncAPI. - * While some of this information could be, or is, described using native AsyncAPI, for consistency it makes sense to - * provide this information here at all times, especially for cases where AsyncAPI does not natively support describing - * payloads using a supported Google Cloud Pub/Sub schema format like Protobuf. - * - * @version 0.1.0 - * @see Google Cloud Pub/Sub message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -@JsonClassDescription("Describes Google Cloud Pub/Sub message schema definition.") -public class GooglePubSubMessageSchemaDefinition { - - /** - * The name of the schema - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty(value = "name", required = true) - @JsonPropertyDescription("The name of the schema") - private String name = ""; - - /** - * The type of the schema - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty(value = "type", required = true) - @JsonPropertyDescription("The type of the schema") - private GooglePubSubMessageSchemaDefinitionType type = GooglePubSubMessageSchemaDefinitionType.PROTOBUF; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinitionType.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinitionType.java deleted file mode 100644 index 305b8d51..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageSchemaDefinitionType.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.asyncapi.v2.binding.message.googlepubsub; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes Google Cloud Pub/Sub message schema definition type. - * - * @version 0.1.0 - * @see Google Cloud Pub/Sub message binding - * @see Types of schemas - * @author Pavel Bodiachevskii - */ -@JsonClassDescription("Describes Google Cloud Pub/Sub message schema definition type.") -public enum GooglePubSubMessageSchemaDefinitionType { - - @JsonProperty("avro") - AVRO, - - @JsonProperty("protobuf") - PROTOBUF - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/http/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/http/HTTPMessageBinding.java deleted file mode 100644 index 52c5f2e2..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/http/HTTPMessageBinding.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.asyncapi.v2.binding.message.http; - -import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v2.schema.Schema; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes HTTP message binding. - *

- * Contains information about the message representation in HTTP. - * - * @version 0.1.0 - * @see HTTP message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class HTTPMessageBinding extends MessageBinding { - - /** - * A Schema object containing the definitions for each query parameter. This schema MUST be of type object - * and have a properties key.* - */ - @Nullable - @JsonProperty("headers") - @JsonPropertyDescription("A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.") - private Schema headers; - - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBinding.java deleted file mode 100644 index 6839c4fe..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBinding.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.asyncapi.v2.binding.message.ibmmq; - -import com.asyncapi.bindings.MessageBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes IBM MQ message binding. - *

- * This object contains information about the message representation in IBM MQ. - * - * @version 0.1.0 - * @see IBM MQ message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes IBM MQ message binding.") -public class IBMMQMessageBinding extends MessageBinding { - - /** - * The type of the message. - *

- * MUST be either string, jms or binary - */ - @Nullable - @Builder.Default - @JsonProperty(value = "type", defaultValue = "string") - @JsonPropertyDescription("The type of the message.") - private IBMMQMessageType type = IBMMQMessageType.STRING; - - /** - * Defines the IBM MQ message headers to include with this message. More than one header can be specified as a comma - * separated list. Supporting information on IBM MQ message formats can be found on this page in the IBM MQ Knowledge Center. - *

- * OPTIONAL if type = binary - *

- * headers MUST NOT be specified if type = string or jms - */ - @Nullable - @JsonProperty("headers") - @JsonPropertyDescription("Defines the IBM MQ message headers to include with this message. More than one header can be specified as a comma separated list.") - private String headers; - - /** - * Provides additional information for application developers: describes the message type or format. - *

- * The description field of the IBM MQ message binding object MAY include CommonMark markdown formatting. - * A minimum markdown syntax as described by CommonMark 0.27 is assumed. - */ - @Nullable - @JsonProperty("description") - @JsonPropertyDescription("Provides additional information for application developers: describes the message type or format.") - private String description; - - /** - * The recommended setting the client should use for the TTL (Time-To-Live) of the message. - * This is a period of time expressed in milliseconds and set by the application that puts the message. - * expiry values are API dependant e.g., MQI and JMS use different units of time and default values for unlimited. - * General information on IBM MQ message expiry can be found on this page in the IBM MQ Knowledge Center. - *

- * expiry value MUST be either zero (unlimited) or greater than zero. - */ - @Nullable - @Builder.Default - @javax.validation.constraints.Min( - value = 0, - message = "Expiry must be greater or equals to 0" - ) - @JsonProperty(value = "expiry", defaultValue = "0") - @JsonPropertyDescription("The recommended setting the client should use for the TTL (Time-To-Live) of the message. This is a period of time expressed in milliseconds and set by the application that puts the message. 'expiry' values are API dependant e.g., MQI and JMS use different units of time and default values for 'unlimited'. General information on IBM MQ message expiry can be found on this [page](https://www.ibm.com/docs/en/ibm-mq/9.2?topic=mqmd-expiry-mqlong) in the IBM MQ Knowledge Center.") - private Integer expiry = 0; - - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageType.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageType.java deleted file mode 100644 index 02a24a33..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageType.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.asyncapi.v2.binding.message.ibmmq; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes IBM MQ message type. - *

- * This object contains information about the message type in IBM MQ. - * - * @version 0.1.0 - * @see IBM MQ message binding - * @author Pavel Bodiachevskii - */ -public enum IBMMQMessageType { - - @JsonProperty("string") - STRING, - - @JsonProperty("jms") - JMS, - - @JsonProperty("binary") - BINARY - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageBinding.java deleted file mode 100644 index ff01459d..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageBinding.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.asyncapi.v2.binding.message.kafka; - -import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v2.schema.Schema; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Kafka message binding. - *

- * Contains information about the message representation in Kafka. - * - * @version 0.1.0 - * @see Kafka message binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class KafkaMessageBinding extends MessageBinding { - - /** - * The message key. - */ - @Nullable - @JsonProperty("key") - @JsonPropertyDescription("The message key.") - private Schema key; - - /** - * If a Schema Registry is used when performing this operation, tells where the id of schema is stored (e.g. header or payload). - */ - @Nullable - @JsonProperty("schemaIdLocation") - @JsonPropertyDescription("If a Schema Registry is used when performing this operation, tells where the id of schema is stored (e.g. header or payload).") - private KafkaMessageSchemaIdLocation schemaIdLocation; - - /** - * Number of bytes or vendor specific values when schema id is encoded in payload (e.g confluent/ apicurio-legacy / apicurio-new). - */ - @Nullable - @JsonProperty("schemaIdPayloadEncoding") - @JsonPropertyDescription("Number of bytes or vendor specific values when schema id is encoded in payload (e.g confluent/ apicurio-legacy / apicurio-new).") - private String schemaIdPayloadEncoding; - - /** - * Freeform string for any naming strategy class to use. Clients should default to the vendor default if not supplied. - */ - @Nullable - @JsonProperty("schemaLookupStrategy") - @JsonPropertyDescription("Freeform string for any naming strategy class to use. Clients should default to the vendor default if not supplied.") - private String schemaLookupStrategy; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.4.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageSchemaIdLocation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageSchemaIdLocation.java deleted file mode 100644 index a413bf46..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/kafka/KafkaMessageSchemaIdLocation.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.asyncapi.v2.binding.message.kafka; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes Kafka message schema id location. - * - * @version 0.1.0 - * @see Kafka message binding - * @author Pavel Bodiachevskii - */ -public enum KafkaMessageSchemaIdLocation { - - @JsonProperty("header") - HEADER, - - @JsonProperty("payload") - PAYLOAD - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mercure/MercureMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mercure/MercureMessageBinding.java deleted file mode 100644 index f0520f76..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/mercure/MercureMessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.message.mercure; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Mercure message binding. - * - * @version 0.1.0 - * @see Mercure message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MercureMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBinding.java deleted file mode 100644 index 90658e35..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBinding.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.asyncapi.v2.binding.operation.amqp; - -import com.asyncapi.bindings.OperationBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -/** - * Describes AMQP 0-9-1 operation binding. - *

- * Contains information about the operation representation in AMQP. - * - * @version 0.2.0 - * @see AMQP operation binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes AMQP 0-9-1 operation binding.") -public class AMQPOperationBinding extends OperationBinding { - - /** - * TTL (Time-To-Live) for the message. It MUST be greater than or equal to zero. - *

- * Applies to: publish, subscribe - */ - @Nullable - @javax.validation.constraints.Min( - value = 0, - message = "TTL (Time-To-Live) for the message must be greater than or equal to zero" - ) - @JsonProperty("expiration") - @JsonPropertyDescription("TTL (Time-To-Live) for the message. It MUST be greater than or equal to zero.") - private Integer expiration; - - /** - * Identifies the user who has sent the message. - *

- * Applies to: publish, subscribe - */ - @Nullable - @JsonProperty("userId") - @JsonPropertyDescription("Identifies the user who has sent the message.") - private String userId; - - /** - * The routing keys the message should be routed to at the time of publishing. - *

- * Applies to: publish, subscribe - */ - @Nullable - @JsonProperty("cc") - @JsonPropertyDescription("The routing keys the message should be routed to at the time of publishing.") - private List cc; - - /** - * A priority for the message. - *

- * Applies to: publish, subscribe - */ - @Nullable - @JsonProperty("priority") - @JsonPropertyDescription("A priority for the message.") - private Integer priority; - - /** - * Delivery mode of the message. Its value MUST be either 1 (transient) or 2 (persistent). - *

- * Applies to: publish, subscribe - */ - @Nullable - @javax.validation.constraints.Min( - value = 1, - message = "Delivery mode of the message must be either 1 (transient) or 2 (persistent)" - ) - @javax.validation.constraints.Max( - value = 2, - message = "Delivery mode of the message must be either 1 (transient) or 2 (persistent)" - ) - @JsonProperty("deliveryMode") - @JsonPropertyDescription("Delivery mode of the message. Its value MUST be either 1 (transient) or 2 (persistent).") - private Integer deliveryMode; - - /** - * Whether the message is mandatory or not. - *

- * Applies to: publish - */ - @Nullable - @JsonProperty("mandatory") - @JsonPropertyDescription("Whether the message is mandatory or not.") - private Boolean mandatory; - - /** - * Like {@link #cc} but consumers will not receive this information. - *

- * Applies to: publish - */ - @Nullable - @JsonProperty("bcc") - @JsonPropertyDescription("Like cc but consumers will not receive this information.") - private List bcc; - - /** - * Name of the queue where the consumer should send the response. - *

- * Applies to: publish, subscribe - */ - @Nullable - @JsonProperty("replyTo") - @JsonPropertyDescription("Name of the queue where the consumer should send the response.") - private String replyTo; - - /** - * Whether the message should include a timestamp or not. - *

- * Applies to: publish, subscribe - */ - @Nullable - @JsonProperty("timestamp") - @JsonPropertyDescription("Whether the message should include a timestamp or not.") - private Boolean timestamp; - - /** - * Whether the consumer should ack the message or not. - *

- * Applies to: subscribe - */ - @Nullable - @JsonProperty("ack") - @JsonPropertyDescription("Whether the consumer should ack the message or not.") - private Boolean ack; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.2.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/googlepubsub/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/googlepubsub/GooglePubSubOperationBinding.java deleted file mode 100644 index 3e9c9bbe..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/googlepubsub/GooglePubSubOperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.operation.googlepubsub; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Google Cloud Pub/Sub operation binding. - * - * @version 0.1.0 - * @see Google Cloud Pub/Sub operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class GooglePubSubOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationBinding.java deleted file mode 100644 index 4b11498c..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationBinding.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.asyncapi.v2.binding.operation.http; - -import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v2.schema.Schema; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * Describes HTTP operation binding. - *

- * Contains information about the operation representation in HTTP. - * - * @version 0.1.0 - * @see HTTP operation binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class HTTPOperationBinding extends OperationBinding { - - /** - * Required. - *

- * Type of operation. Its value MUST be either request or response. - */ - @NotNull - @Builder.Default - @javax.validation.constraints.NotNull - @JsonProperty(value = "type", required = true) - @JsonPropertyDescription("Type of operation. Its value MUST be either request or response.") - private HTTPOperationType type = HTTPOperationType.REQUEST; - - /** - * When type is request, this is the HTTP method, otherwise it MUST be ignored. Its value MUST be one of - * GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS, CONNECT, and TRACE. - */ - @Nullable - @JsonProperty("method") - @JsonPropertyDescription("When type is request, this is the HTTP method, otherwise it MUST be ignored. Its value MUST be one of GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS, CONNECT, and TRACE.") - private HTTPOperationMethod method; - - /** - * A Schema object containing the definitions for each query parameter. This schema MUST be of type object - * and have a properties key. - */ - @Nullable - @JsonProperty("query") - @JsonPropertyDescription("A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.") - private Schema query; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationMethod.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationMethod.java deleted file mode 100644 index 6781a41c..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationMethod.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.asyncapi.v2.binding.operation.http; - -/** - * Describes HTTP operation type. - *

- * Contains information about the operation type. - * - * @version 0.1.0 - * @see HTTP operation binding - * @author Pavel Bodiachevskii - */ -public enum HTTPOperationMethod { - GET, - PUT, - POST, - PATCH, - DELETE, - HEAD, - OPTIONS, - CONNECT, - TRACE -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationType.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationType.java deleted file mode 100644 index c45309eb..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/http/HTTPOperationType.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.asyncapi.v2.binding.operation.http; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public enum HTTPOperationType { - - @JsonProperty("request") - REQUEST, - - @JsonProperty("response") - RESPONSE - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ibmmq/IBMMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ibmmq/IBMMQOperationBinding.java deleted file mode 100644 index c0f78c53..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/ibmmq/IBMMQOperationBinding.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.asyncapi.v2.binding.operation.ibmmq; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * Describes IBM MQ operation binding. - *

- * This object MUST NOT contain any properties. Its name is reserved for future use. - * - * @version 0.1.0 - * @see IBM MQ operation binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class IBMMQOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBinding.java deleted file mode 100644 index 77e08058..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBinding.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.asyncapi.v2.binding.operation.kafka; - -import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v2.schema.Schema; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Kafka operation binding. - *

- * Contains information about the operation representation in Kafka. - * - * @version 0.1.0 - * @see Kafka operation binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class KafkaOperationBinding extends OperationBinding { - - /** - * Id of the consumer group. - */ - @Nullable - @JsonProperty("groupId") - @JsonPropertyDescription("Id of the consumer group.") - private Schema groupId; - - /** - * Id of the consumer inside a consumer group. - */ - @Nullable - @JsonProperty("clientId") - @JsonPropertyDescription("Id of the consumer inside a consumer group.") - private Schema clientId; - - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - private String bindingVersion = "0.4.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mercure/MercureOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mercure/MercureOperationBinding.java deleted file mode 100644 index a62bd342..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/operation/mercure/MercureOperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.operation.mercure; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Mercure operation binding. - * - * @version 0.1.0 - * @see Mercure operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MercureOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp/AMQPServerBinding.java deleted file mode 100644 index 1b373041..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/amqp/AMQPServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.amqp; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes AMQP 0-9-1 server binding. - * - * @version 0.2.0 - * @see AMQP server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class AMQPServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/anypointmq/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/anypointmq/AnypointMQServerBinding.java deleted file mode 100644 index e0bed3c4..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/anypointmq/AnypointMQServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.anypointmq; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Anypoint MQ server binding. - * - * @version 0.0.1 - * @see Anypoint MQ server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class AnypointMQServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/googlepubsub/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/googlepubsub/GooglePubSubServerBinding.java deleted file mode 100644 index b0315ced..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/googlepubsub/GooglePubSubServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.googlepubsub; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Google Cloud Pub/Sub server binding. - * - * @version 0.1.0 - * @see Google Cloud Pub/Sub server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class GooglePubSubServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBinding.java deleted file mode 100644 index 2ce00e3c..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBinding.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.asyncapi.v2.binding.server.ibmmq; - -import com.asyncapi.bindings.ServerBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes IBM MQ server binding. - *

- * This object contains server connection information about the IBM MQ server, referred to as an IBM MQ queue manager. - * This object contains additional connectivity information not possible to represent within the core AsyncAPI specification. - * - * @version 0.1.0 - * @see IBM MQ server binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes IBM MQ server binding.") -public class IBMMQServerBinding extends ServerBinding { - - /** - * Defines a logical group of IBM MQ server objects. This is necessary to specify multi-endpoint configurations used - * in high availability deployments. If omitted, the server object is not part of a group. - *

- * MUST NOT be specified for URI Scheme http:// or file:// - */ - @Nullable - @JsonProperty("groupId") - @JsonPropertyDescription("Defines a logical group of IBM MQ server objects. This is necessary to specify multi-endpoint configurations used in high availability deployments. If omitted, the server object is not part of a group.") - private String groupId; - - /** - * The name of the IBM MQ queue manager to bind to in the CCDT file. - *

- * MUST NOT be specified for URI Scheme ibmmq:// - */ - @Nullable - @Builder.Default - @JsonProperty(value = "ccdtQueueManagerName", defaultValue = "*") - @JsonPropertyDescription("The name of the IBM MQ queue manager to bind to in the CCDT file.") - private String ccdtQueueManagerName = "*"; - - /** - * The recommended cipher specification used to establish a TLS connection between the client and the IBM MQ queue manager. - * More information on SSL/TLS cipher specifications supported by IBM MQ can be found on this page in the IBM MQ Knowledge Center. - *

- * MUST NOT be specified for protocol ibmmq or URI Scheme file:// or http:// - */ - @Nullable - @Builder.Default - @JsonProperty(value = "cipherSpec", defaultValue = "ANY") - @JsonPropertyDescription("The recommended cipher specification used to establish a TLS connection between the client and the IBM MQ queue manager. More information on SSL/TLS cipher specifications supported by IBM MQ can be found on this page in the IBM MQ Knowledge Center.") - private String cipherSpec = "ANY"; - - /** - * If multiEndpointServer is true then multiple connections can be workload balanced and applications should not make - * assumptions as to where messages are processed. Where message ordering, or affinity to specific message resources - * is necessary, a single endpoint (multiEndpointServer = false) may be required. - *

- * MUST NOT be specified for URI Scheme file:// or http:// - */ - @Builder.Default - @JsonProperty(value = "multiEndpointServer", defaultValue = "false") - @JsonPropertyDescription("If multiEndpointServer is true then multiple connections can be workload balanced and applications should not make assumptions as to where messages are processed. Where message ordering, or affinity to specific message resources is necessary, a single endpoint (multiEndpointServer = false) may be required. MUST NOT be specified for URI Scheme file:// or http://") - private Boolean multiEndpointServer = false; - - /** - * The recommended value (in seconds) for the heartbeat sent to the queue manager during periods of inactivity. - * A value of zero means that no heart beats are sent. A value of 1 means that the client will use the value defined by the queue manager. - * More information on heart beat interval can be found on this page in the IBM MQ Knowledge Center. - *

- * MUST be 0-999999 - */ - @Builder.Default - @javax.validation.constraints.Min( - value = 0, - message = "Heart beat interval must be greater or equals to 0" - ) - @javax.validation.constraints.Max( - value = 999999, - message = "Heart beat interval must be less or equals to 999999" - ) - @JsonProperty(value = "heartBeatInterval", defaultValue = "300") - @JsonPropertyDescription("The recommended value (in seconds) for the heartbeat sent to the queue manager during periods of inactivity. A value of zero means that no heart beats are sent. A value of 1 means that the client will use the value defined by the queue manager.") - private int heartBeatInterval = 300; - - /** - * The version of this binding. - */ - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/kafka/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/kafka/KafkaServerBinding.java deleted file mode 100644 index 0e7c02db..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/kafka/KafkaServerBinding.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.asyncapi.v2.binding.server.kafka; - -import com.asyncapi.bindings.ServerBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -/** - * Describes Kafka server binding. - * - * @version 0.4.0 - * @see Kafka server binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@JsonClassDescription("Describes Kafka server binding.") -public class KafkaServerBinding extends ServerBinding { - - /** - * API URL for the Schema Registry used when producing Kafka messages (if a Schema Registry was used) - */ - @Nullable - @JsonProperty("schemaRegistryUrl") - @JsonPropertyDescription("API URL for the Schema Registry used when producing Kafka messages (if a Schema Registry was used)") - private String schemaRegistryUrl; - - /** - * MUST NOT be specified if schemaRegistryUrl is not specified - *

- * The vendor of Schema Registry and Kafka serdes library that should be used (e.g. apicurio, confluent, ibm, or karapace) - */ - @Nullable - @JsonProperty("schemaRegistryVendor") - @JsonPropertyDescription("The vendor of Schema Registry and Kafka serdes library that should be used (e.g. apicurio, confluent, ibm, or karapace)") - private String schemaRegistryVendor; - - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.4.0"; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mercure/MercureServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mercure/MercureServerBinding.java deleted file mode 100644 index 16298ce0..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/mercure/MercureServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.server.mercure; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Mercure server binding. - * - * @version 0.1.0 - * @see Mercure server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MercureServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java index ec2c3593..ab171d97 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -1,15 +1,15 @@ package com.asyncapi.v2.jackson.binding.channel; import com.asyncapi.v2.Reference; -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelBinding; -import com.asyncapi.v2.binding.channel.amqp1.AMQP1ChannelBinding; -import com.asyncapi.v2.binding.channel.anypointmq.AnypointMQChannelBinding; -import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBinding; -import com.asyncapi.v2.binding.channel.http.HTTPChannelBinding; -import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBinding; -import com.asyncapi.v2.binding.channel.jms.JMSChannelBinding; -import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBinding; -import com.asyncapi.v2.binding.channel.mercure.MercureChannelBinding; +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding; +import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; +import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java index d0ffbb11..82e10c25 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java @@ -1,15 +1,15 @@ package com.asyncapi.v2.jackson.binding.message; import com.asyncapi.v2.Reference; -import com.asyncapi.v2.binding.message.amqp.AMQPMessageBinding; -import com.asyncapi.v2.binding.message.amqp1.AMQP1MessageBinding; -import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBinding; -import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBinding; -import com.asyncapi.v2.binding.message.http.HTTPMessageBinding; -import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBinding; -import com.asyncapi.v2.binding.message.jms.JMSMessageBinding; -import com.asyncapi.v2.binding.message.kafka.KafkaMessageBinding; -import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding; +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding; +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; +import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java index 33980f72..7308f6c5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java @@ -1,15 +1,15 @@ package com.asyncapi.v2.jackson.binding.operation; import com.asyncapi.v2.Reference; -import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBinding; -import com.asyncapi.v2.binding.operation.amqp1.AMQP1OperationBinding; -import com.asyncapi.v2.binding.operation.anypointmq.AnypointMQOperationBinding; -import com.asyncapi.v2.binding.operation.googlepubsub.GooglePubSubOperationBinding; -import com.asyncapi.v2.binding.operation.http.HTTPOperationBinding; -import com.asyncapi.v2.binding.operation.ibmmq.IBMMQOperationBinding; -import com.asyncapi.v2.binding.operation.jms.JMSOperationBinding; -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBinding; -import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding; +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding; +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; +import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java index b8c56fb7..ed36e933 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java @@ -1,15 +1,15 @@ package com.asyncapi.v2.jackson.binding.server; import com.asyncapi.v2.Reference; -import com.asyncapi.v2.binding.server.amqp.AMQPServerBinding; -import com.asyncapi.v2.binding.server.amqp1.AMQP1ServerBinding; -import com.asyncapi.v2.binding.server.anypointmq.AnypointMQServerBinding; -import com.asyncapi.v2.binding.server.googlepubsub.GooglePubSubServerBinding; -import com.asyncapi.v2.binding.server.http.HTTPServerBinding; -import com.asyncapi.v2.binding.server.ibmmq.IBMMQServerBinding; -import com.asyncapi.v2.binding.server.jms.JMSServerBinding; -import com.asyncapi.v2.binding.server.kafka.KafkaServerBinding; -import com.asyncapi.v2.binding.server.mercure.MercureServerBinding; +import com.asyncapi.bindings.amqp.v0._2_0.server.AMQPServerBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding; +import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelType.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelType.java deleted file mode 100644 index e6fe8c81..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp/AMQPChannelType.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.asyncapi.v3.binding.channel.amqp; - -import com.fasterxml.jackson.annotation.JsonAlias; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes AMQP 0-9-1 channel type. - *

- * Contains information about the type of channel in AMQP. - * - * @version 0.2.0 - * @see AMQP channel binding - * @author Pavel Bodiachevskii - */ -public enum AMQPChannelType { - - @JsonProperty("queue") - QUEUE, - - @JsonProperty("routingKey") - @JsonAlias("routingKey") - ROUTING_KEY - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp1/AMQP1ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp1/AMQP1ChannelBinding.java deleted file mode 100644 index b3742e68..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/amqp1/AMQP1ChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.channel.amqp1; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes AMQP 1.0 channel binding. - * - * @version 0.1.0 - * @see AMQP 1.0 channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class AMQP1ChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelDestinationType.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelDestinationType.java deleted file mode 100644 index 13609498..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelDestinationType.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.asyncapi.v3.binding.channel.ibmmq; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes IBM MQ channel destination type. - * - * @version 0.1.0 - * @see IBM MQ channel binding - * @author Pavel Bodiachevskii - */ -public enum IBMMQChannelDestinationType { - - @JsonProperty("topic") - TOPIC, - - @JsonProperty("queue") - QUEUE - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/jms/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/jms/JMSChannelBinding.java deleted file mode 100644 index 528e5fd4..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/jms/JMSChannelBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.channel.jms; - -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes JMS channel binding. - * - * @version 0.1.0 - * @see JMS channel binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class JMSChannelBinding extends ChannelBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelTopicConfiguration.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelTopicConfiguration.java deleted file mode 100644 index 63ed484c..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/channel/kafka/KafkaChannelTopicConfiguration.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.asyncapi.v3.binding.channel.kafka; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -/** - * This objects contains information about the API relevant topic configuration in Kafka. - * - * @version 0.4.0 - * @see Kafka channel binding - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class KafkaChannelTopicConfiguration { - - /** - * The cleanup.policy configuration option. - *

- * array may only contain delete and/or compact - */ - @Nullable - @JsonProperty("cleanup.policy") - private List cleanupPolicy; - - /** - * The retention.ms configuration option. - */ - @Nullable - @javax.validation.constraints.Min( - value = -1, - message = "retention.ms must be greater or equals to -1" - ) - @JsonProperty("retention.ms") - @JsonPropertyDescription("The [`retention.ms`](https://kafka.apache.org/documentation/#topicconfigs_retention.ms) configuration option.") - private Integer retentionMs; - - /** - * The retention.bytes configuration option. - */ - @Nullable - @javax.validation.constraints.Min( - value = -1, - message = "retention.bytes must be greater or equals to -1" - ) - @JsonProperty("retention.bytes") - @JsonPropertyDescription("The [`retention.bytes`](https://kafka.apache.org/documentation/#topicconfigs_retention.bytes) configuration option.") - private Integer retentionBytes; - - /** - * The delete.retention.ms configuration option. - */ - @Nullable - @javax.validation.constraints.Min( - value = 0, - message = "delete.retention.ms must be greater or equals to 0" - ) - @JsonProperty("delete.retention.ms") - @JsonPropertyDescription("The [`delete.retention.ms`](https://kafka.apache.org/documentation/#topicconfigs_delete.retention.ms) configuration option.") - private Integer deleteRetentionMs; - - /** - * The max.message.bytes configuration option. - */ - @Nullable - @javax.validation.constraints.Min( - value = 0, - message = "max.message.bytes must be greater or equals to 0" - ) - @JsonProperty("max.message.bytes") - @JsonPropertyDescription("The [`max.message.bytes`](https://kafka.apache.org/documentation/#topicconfigs_max.message.bytes) configuration option.") - private Integer maxMessageBytes; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/jms/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/jms/JMSMessageBinding.java deleted file mode 100644 index 4c9a0f59..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/message/jms/JMSMessageBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.message.jms; - -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes JMS message binding. - * - * @version 0.1.0 - * @see JMS message binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class JMSMessageBinding extends MessageBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp1/AMQP1OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp1/AMQP1OperationBinding.java deleted file mode 100644 index b3d32834..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/amqp1/AMQP1OperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.operation.amqp1; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes AMQP 1.0 operation binding. - * - * @version 0.1.0 - * @see AMQP operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class AMQP1OperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/anypointmq/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/anypointmq/AnypointMQOperationBinding.java deleted file mode 100644 index f4355eba..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/anypointmq/AnypointMQOperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.operation.anypointmq; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes Anypoint MQ operation binding. - * - * @version 0.0.1 - * @see Anypoint MQ operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class AnypointMQOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/jms/JMSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/jms/JMSOperationBinding.java deleted file mode 100644 index 9933d531..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/operation/jms/JMSOperationBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.operation.jms; - -import com.asyncapi.bindings.OperationBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes JMS operation binding. - * - * @version 0.1.0 - * @see JMS operation binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class JMSOperationBinding extends OperationBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp1/AMQP1ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp1/AMQP1ServerBinding.java deleted file mode 100644 index 6536e264..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/amqp1/AMQP1ServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.server.amqp1; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes AMQP 1.0 server binding. - * - * @version 0.1.0 - * @see AMQP server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class AMQP1ServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/http/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/http/HTTPServerBinding.java deleted file mode 100644 index 3a0073a3..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/http/HTTPServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.server.http; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes HTTP server binding. - * - * @version 0.1.0 - * @see HTTP server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class HTTPServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/jms/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/jms/JMSServerBinding.java deleted file mode 100644 index 75093e03..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/binding/server/jms/JMSServerBinding.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v3.binding.server.jms; - -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes JMS server binding. - * - * @version 0.1.0 - * @see JMS server binding - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class JMSServerBinding extends ServerBinding { -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java index 109541ea..8c72359b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java @@ -1,15 +1,15 @@ package com.asyncapi.v3.jackson.binding.channel; import com.asyncapi.v3.Reference; -import com.asyncapi.v3.binding.channel.amqp.AMQPChannelBinding; -import com.asyncapi.v3.binding.channel.amqp1.AMQP1ChannelBinding; -import com.asyncapi.v3.binding.channel.anypointmq.AnypointMQChannelBinding; -import com.asyncapi.v3.binding.channel.googlepubsub.GooglePubSubChannelBinding; -import com.asyncapi.v3.binding.channel.http.HTTPChannelBinding; -import com.asyncapi.v3.binding.channel.ibmmq.IBMMQChannelBinding; -import com.asyncapi.v3.binding.channel.jms.JMSChannelBinding; -import com.asyncapi.v3.binding.channel.kafka.KafkaChannelBinding; -import com.asyncapi.v3.binding.channel.mercure.MercureChannelBinding; +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding; +import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; +import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java index 360c0504..fa4737d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java @@ -1,15 +1,15 @@ package com.asyncapi.v3.jackson.binding.message; import com.asyncapi.v3.Reference; -import com.asyncapi.v3.binding.message.amqp.AMQPMessageBinding; -import com.asyncapi.v3.binding.message.amqp1.AMQP1MessageBinding; -import com.asyncapi.v3.binding.message.anypointmq.AnypointMQMessageBinding; -import com.asyncapi.v3.binding.message.googlepubsub.GooglePubSubMessageBinding; -import com.asyncapi.v3.binding.message.http.HTTPMessageBinding; -import com.asyncapi.v3.binding.message.ibmmq.IBMMQMessageBinding; -import com.asyncapi.v3.binding.message.jms.JMSMessageBinding; -import com.asyncapi.v3.binding.message.kafka.KafkaMessageBinding; -import com.asyncapi.v3.binding.message.mercure.MercureMessageBinding; +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding; +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; +import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java index f7b1c0bd..8128a462 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java @@ -1,15 +1,15 @@ package com.asyncapi.v3.jackson.binding.operation; import com.asyncapi.v3.Reference; -import com.asyncapi.v3.binding.operation.amqp.AMQPOperationBinding; -import com.asyncapi.v3.binding.operation.amqp1.AMQP1OperationBinding; -import com.asyncapi.v3.binding.operation.anypointmq.AnypointMQOperationBinding; -import com.asyncapi.v3.binding.operation.googlepubsub.GooglePubSubOperationBinding; -import com.asyncapi.v3.binding.operation.http.HTTPOperationBinding; -import com.asyncapi.v3.binding.operation.ibmmq.IBMMQOperationBinding; -import com.asyncapi.v3.binding.operation.jms.JMSOperationBinding; -import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBinding; -import com.asyncapi.v3.binding.operation.mercure.MercureOperationBinding; +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding; +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; +import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java index 645dbe9f..99369733 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java @@ -1,15 +1,15 @@ package com.asyncapi.v3.jackson.binding.server; import com.asyncapi.v3.Reference; -import com.asyncapi.v3.binding.server.amqp.AMQPServerBinding; -import com.asyncapi.v3.binding.server.amqp1.AMQP1ServerBinding; -import com.asyncapi.v3.binding.server.anypointmq.AnypointMQServerBinding; -import com.asyncapi.v3.binding.server.googlepubsub.GooglePubSubServerBinding; -import com.asyncapi.v3.binding.server.http.HTTPServerBinding; -import com.asyncapi.v3.binding.server.ibmmq.IBMMQServerBinding; -import com.asyncapi.v3.binding.server.jms.JMSServerBinding; -import com.asyncapi.v3.binding.server.kafka.KafkaServerBinding; -import com.asyncapi.v3.binding.server.mercure.MercureServerBinding; +import com.asyncapi.bindings.amqp.v0._2_0.server.AMQPServerBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding; +import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt index 9a58f547..2d1023e4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt @@ -8,11 +8,12 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.v2.binding.message.http.HTTPMessageBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationType +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme +import com.asyncapi.v3.schema.AsyncAPISchema class GitterStreaming: AbstractExampleValidationTest() { @@ -248,15 +249,15 @@ class GitterStreaming: AbstractExampleValidationTest() { ) .bindings(mapOf( Pair("http", HTTPMessageBinding.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("Transfer-Encoding", Schema.builder() + Pair("Transfer-Encoding", AsyncAPISchema.builder() .type("string") .constValue("chunked") .build() ), - Pair("Trailer", Schema.builder() + Pair("Trailer", AsyncAPISchema.builder() .type("string") .constValue("\\r\\n") .build() @@ -278,15 +279,15 @@ class GitterStreaming: AbstractExampleValidationTest() { ) .bindings(mapOf( Pair("http", HTTPMessageBinding.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("Transfer-Encoding", Schema.builder() + Pair("Transfer-Encoding", AsyncAPISchema.builder() .type("string") .constValue("chunked") .build() ), - Pair("Trailer", Schema.builder() + Pair("Trailer", AsyncAPISchema.builder() .type("string") .constValue("\\r\\n") .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt index 61a0dc3c..8331e089 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt @@ -6,9 +6,9 @@ import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.v2.binding.operation.http.HTTPOperationBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationMethod -import com.asyncapi.v2.binding.operation.http.HTTPOperationType +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt index d9f43432..669644e0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt @@ -8,10 +8,10 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelBinding -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelType -import com.asyncapi.v2.binding.channel.amqp.queue.AMQPChannelQueueProperties -import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding import com.asyncapi.v2.schema.Schema class RpcClient: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt index 01f305a7..20fd2450 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt @@ -8,10 +8,10 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelBinding -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelType -import com.asyncapi.v2.binding.channel.amqp.queue.AMQPChannelQueueProperties -import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding import com.asyncapi.v2.schema.Schema class RpcServer: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt index 3d4e273d..675a9b3e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt @@ -12,9 +12,10 @@ import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.SecurityScheme +import com.asyncapi.v3.schema.AsyncAPISchema import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -245,7 +246,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(Schema.builder() + .clientId(AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt index bac1cb5c..09ca44c4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt @@ -12,12 +12,13 @@ import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.v3.schema.AsyncAPISchema import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -265,7 +266,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(Schema.builder() + .clientId(AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt index 97849dce..cced45cd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt @@ -9,11 +9,12 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.v2.binding.message.http.HTTPMessageBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationType +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme +import com.asyncapi.v3.schema.AsyncAPISchema class GitterStreaming: AbstractExampleValidationTest() { @@ -270,15 +271,15 @@ class GitterStreaming: AbstractExampleValidationTest() { )) .messageBindings(mapOf( Pair("http", HTTPMessageBinding.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("Transfer-Encoding", Schema.builder() + Pair("Transfer-Encoding", AsyncAPISchema.builder() .type("string") .constValue("chunked") .build() ), - Pair("Trailer", Schema.builder() + Pair("Trailer", AsyncAPISchema.builder() .type("string") .constValue("\\r\\n") .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt index 9bd85324..ffff0a14 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt @@ -10,9 +10,6 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.v2.binding.message.http.HTTPMessageBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationType import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt index 0b893a60..60a32015 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt @@ -6,9 +6,9 @@ import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.v2.binding.operation.http.HTTPOperationBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationMethod -import com.asyncapi.v2.binding.operation.http.HTTPOperationType +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt index 07c4586f..2b2abed8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt @@ -8,10 +8,10 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelBinding -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelType -import com.asyncapi.v2.binding.channel.amqp.queue.AMQPChannelQueueProperties -import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding import com.asyncapi.v2.schema.Schema class RpcClient: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt index 95fa19f1..a25c741f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt @@ -8,10 +8,10 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelBinding -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelType -import com.asyncapi.v2.binding.channel.amqp.queue.AMQPChannelQueueProperties -import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding import com.asyncapi.v2.schema.Schema class RpcServer: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt index ede0887b..16a885f6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt @@ -12,9 +12,10 @@ import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.SecurityScheme +import com.asyncapi.v3.schema.AsyncAPISchema import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -273,7 +274,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(Schema.builder() + .clientId(AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt index cfb050f4..c0324e8e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt @@ -12,12 +12,13 @@ import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.v3.schema.AsyncAPISchema import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -272,7 +273,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(Schema.builder() + .clientId(AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt index c1e3b6a0..a36f4b18 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt @@ -14,11 +14,11 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.reply.OperationReply import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.binding.channel.kafka.KafkaChannelBinding -import com.asyncapi.v3.binding.channel.kafka.KafkaChannelTopicCleanupPolicy -import com.asyncapi.v3.binding.channel.kafka.KafkaChannelTopicConfiguration -import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBinding -import com.asyncapi.v3.binding.server.kafka.KafkaServerBinding +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicCleanupPolicy +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguration +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.multiformat.AvroFormatSchema import com.asyncapi.v3.security_scheme.SecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index c6880667..6f42115a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.binding.message.http.HTTPMessageBinding +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding import com.asyncapi.v3.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -10,8 +10,8 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.binding.operation.http.HTTPOperationBinding -import com.asyncapi.v3.binding.operation.http.HTTPOperationMethod +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.JsonSchema import com.asyncapi.v3.schema.multiformat.JsonFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt index aa5e02cd..eb7fda1c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt @@ -7,8 +7,8 @@ import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.v3.binding.operation.http.HTTPOperationBinding -import com.asyncapi.v3.binding.operation.http.HTTPOperationMethod +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt index ed2fda23..10190f74 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt @@ -10,10 +10,10 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.binding.channel.amqp.AMQPChannelBinding -import com.asyncapi.v3.binding.channel.amqp.AMQPChannelType -import com.asyncapi.v3.binding.channel.amqp.queue.AMQPChannelQueueProperties -import com.asyncapi.v3.binding.operation.amqp.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding import com.asyncapi.v3.schema.AsyncAPISchema class RpcClientAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt index 40902eee..79d92ff1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt @@ -10,10 +10,10 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.binding.channel.amqp.AMQPChannelBinding -import com.asyncapi.v3.binding.channel.amqp.AMQPChannelType -import com.asyncapi.v3.binding.channel.amqp.queue.AMQPChannelQueueProperties -import com.asyncapi.v3.binding.operation.amqp.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding import com.asyncapi.v3.schema.AsyncAPISchema class RpcServerAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt index 9460de7e..f18e4bce 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt @@ -13,7 +13,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.security_scheme.SecurityScheme import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt index cdd874db..2a470789 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt @@ -12,7 +12,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.security_scheme.SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 9ec414eb..00c5a783 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -6,14 +6,14 @@ import com.asyncapi.v2._0_0.model.channel.operation.OperationWithReferenceToMess import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.ChannelBinding import com.asyncapi.v2.binding.channel.amqp.AMQPChannelBindingTest -import com.asyncapi.v2.binding.channel.amqp1.AMQP1ChannelBinding +import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding import com.asyncapi.v2.binding.channel.anypointmq.AnypointMQChannelBindingTest import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBindingTest -import com.asyncapi.v2.binding.channel.http.HTTPChannelBinding +import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest -import com.asyncapi.v2.binding.channel.jms.JMSChannelBinding +import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest -import com.asyncapi.v2.binding.channel.mercure.MercureChannelBinding +import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 743da469..2e20ecb1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -7,14 +7,14 @@ import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.MessageBinding import com.asyncapi.v2.binding.message.amqp.AMQPMessageBindingTest -import com.asyncapi.v2.binding.message.amqp1.AMQP1MessageBinding +import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest -import com.asyncapi.v2.binding.message.jms.JMSMessageBinding +import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest -import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding +import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 9bd048db..c2a13012 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -5,14 +5,14 @@ import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.binding.message.amqp.AMQPMessageBindingTest -import com.asyncapi.v2.binding.message.amqp1.AMQP1MessageBinding +import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest -import com.asyncapi.v2.binding.message.jms.JMSMessageBinding +import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest -import com.asyncapi.v2.binding.message.mercure.MercureMessageBinding +import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 168de5b0..5965b602 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -7,14 +7,14 @@ import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.message.MessageTest import com.asyncapi.bindings.OperationBinding import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBindingTest -import com.asyncapi.v2.binding.operation.amqp1.AMQP1OperationBinding -import com.asyncapi.v2.binding.operation.anypointmq.AnypointMQOperationBinding -import com.asyncapi.v2.binding.operation.googlepubsub.GooglePubSubOperationBinding +import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding +import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding +import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest -import com.asyncapi.v2.binding.operation.ibmmq.IBMMQOperationBinding -import com.asyncapi.v2.binding.operation.jms.JMSOperationBinding +import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding +import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest -import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding +import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 1ae7d466..c27ffb77 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -4,14 +4,14 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBindingTest -import com.asyncapi.v2.binding.operation.amqp1.AMQP1OperationBinding -import com.asyncapi.v2.binding.operation.anypointmq.AnypointMQOperationBinding -import com.asyncapi.v2.binding.operation.googlepubsub.GooglePubSubOperationBinding +import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding +import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding +import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest -import com.asyncapi.v2.binding.operation.ibmmq.IBMMQOperationBinding -import com.asyncapi.v2.binding.operation.jms.JMSOperationBinding +import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding +import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest -import com.asyncapi.v2.binding.operation.mercure.MercureOperationBinding +import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 9fb7ea73..582d4cb2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -2,14 +2,14 @@ package com.asyncapi.v2._0_0.model.server import com.asyncapi.v2.SerDeTest import com.asyncapi.bindings.ServerBinding -import com.asyncapi.v2.binding.server.amqp1.AMQP1ServerBinding -import com.asyncapi.v2.binding.server.anypointmq.AnypointMQServerBinding -import com.asyncapi.v2.binding.server.googlepubsub.GooglePubSubServerBinding -import com.asyncapi.v2.binding.server.http.HTTPServerBinding -import com.asyncapi.v2.binding.server.ibmmq.IBMMQServerBinding -import com.asyncapi.v2.binding.server.jms.JMSServerBinding -import com.asyncapi.v2.binding.server.kafka.KafkaServerBinding -import com.asyncapi.v2.binding.server.mercure.MercureServerBinding +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding +import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding +import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding +import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index e8769a3b..1bac6bc8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -3,14 +3,14 @@ package com.asyncapi.v2._6_0.model.server import com.asyncapi.v2.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.Tag -import com.asyncapi.v2.binding.server.amqp1.AMQP1ServerBinding -import com.asyncapi.v2.binding.server.anypointmq.AnypointMQServerBinding -import com.asyncapi.v2.binding.server.googlepubsub.GooglePubSubServerBinding -import com.asyncapi.v2.binding.server.http.HTTPServerBinding -import com.asyncapi.v2.binding.server.ibmmq.IBMMQServerBinding -import com.asyncapi.v2.binding.server.jms.JMSServerBinding -import com.asyncapi.v2.binding.server.kafka.KafkaServerBinding -import com.asyncapi.v2.binding.server.mercure.MercureServerBinding +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding +import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding +import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding +import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBindingTest.kt index 7ac5f187..05b41813 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBindingTest.kt @@ -1,9 +1,11 @@ package com.asyncapi.v2.binding.channel.amqp import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.binding.channel.amqp.exchange.AMQPChannelExchangeProperties -import com.asyncapi.v2.binding.channel.amqp.exchange.AMQPChannelExchangeType -import com.asyncapi.v2.binding.channel.amqp.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeProperties +import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeType +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties /** * @version 2.6.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt index 57b0626c..b19a37d6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt @@ -1,6 +1,8 @@ package com.asyncapi.v2.binding.channel.anypointmq import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelDestinationType /** * @version 2.6.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt index 3f3c180b..02400db5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt @@ -1,6 +1,9 @@ package com.asyncapi.v2.binding.channel.googlepubsub import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelMessageStoragePolicy +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelSchemaSettings class GooglePubSubChannelBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBindingTest.kt index 5d6a9f87..d93f7cf4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBindingTest.kt @@ -1,6 +1,10 @@ package com.asyncapi.v2.binding.channel.ibmmq import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelDestinationType +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelQueueProperties +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelTopicProperties class IBMMQChannelBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBindingTest.kt index 98502a4f..d505bdfe 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBindingTest.kt @@ -1,6 +1,9 @@ package com.asyncapi.v2.binding.channel.kafka import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguration +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicCleanupPolicy /** * @version 2.6.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/amqp/AMQPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/amqp/AMQPMessageBindingTest.kt index baa183c2..9f28ad54 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/amqp/AMQPMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/amqp/AMQPMessageBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.message.amqp import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding class AMQPMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt index 83a254e9..1967465c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt @@ -1,8 +1,9 @@ package com.asyncapi.v2.binding.message.anypointmq +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.schema.Type +import com.asyncapi.v3.schema.AsyncAPISchema class AnypointMQMessageBindingTest: SerDeTest() { @@ -16,12 +17,12 @@ class AnypointMQMessageBindingTest: SerDeTest() { override fun build(): AnypointMQMessageBinding { return AnypointMQMessageBinding.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type(Type.OBJECT) .properties(mapOf( Pair( "correlationId", - Schema.builder() + AsyncAPISchema.builder() .type(Type.STRING) .description("Correlation ID set by application") .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt index ca4354aa..1f147927 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt @@ -1,6 +1,9 @@ package com.asyncapi.v2.binding.message.googlepubsub import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinition +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinitionType class GooglePubSubMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/http/HTTPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/http/HTTPMessageBindingTest.kt index 8c616f2c..32d0c9cd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/http/HTTPMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/http/HTTPMessageBindingTest.kt @@ -1,8 +1,9 @@ package com.asyncapi.v2.binding.message.http +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.schema.Type +import com.asyncapi.v3.schema.AsyncAPISchema class HTTPMessageBindingTest: SerDeTest() { @@ -16,12 +17,12 @@ class HTTPMessageBindingTest: SerDeTest() { override fun build(): HTTPMessageBinding { return HTTPMessageBinding.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type(Type.OBJECT) .properties(mapOf( Pair( "Content-Type", - Schema.builder() + AsyncAPISchema.builder() .type(Type.STRING) .enumValue(listOf("application/json")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBindingTest.kt index f190262f..0d65208c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBindingTest.kt @@ -1,6 +1,8 @@ package com.asyncapi.v2.binding.message.ibmmq import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageType class IBMMQMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/kafka/KafkaMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/kafka/KafkaMessageBindingTest.kt index 7180234b..ade09c08 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/kafka/KafkaMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/kafka/KafkaMessageBindingTest.kt @@ -1,8 +1,10 @@ package com.asyncapi.v2.binding.message.kafka +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageSchemaIdLocation import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.schema.Type +import com.asyncapi.v3.schema.AsyncAPISchema class KafkaMessageBindingTest: SerDeTest() { @@ -16,7 +18,7 @@ class KafkaMessageBindingTest: SerDeTest() { override fun build(): KafkaMessageBinding { return KafkaMessageBinding.builder() - .key(Schema.builder() + .key(AsyncAPISchema.builder() .type(Type.STRING) .enumValue(listOf("myKey")) .build()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBindingTest.kt index b62375d4..4e4a2fe8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.operation.amqp import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding class AMQPOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/http/HTTPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/http/HTTPOperationBindingTest.kt index afe6cedd..0ff6e3a2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/http/HTTPOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/http/HTTPOperationBindingTest.kt @@ -1,8 +1,11 @@ package com.asyncapi.v2.binding.operation.http +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.schema.Type +import com.asyncapi.v3.schema.AsyncAPISchema import java.math.BigDecimal class HTTPOperationBindingTest: SerDeTest() { @@ -19,13 +22,13 @@ class HTTPOperationBindingTest: SerDeTest() { return HTTPOperationBinding.builder() .type(HTTPOperationType.REQUEST) .method(HTTPOperationMethod.GET) - .query(Schema.builder() + .query(AsyncAPISchema.builder() .type(Type.OBJECT) .required(listOf("companyId")) .properties(mapOf( Pair( "companyId", - Schema.builder() + AsyncAPISchema.builder() .type(Type.NUMBER) .minimum(BigDecimal.ONE) .description("The Id of the company.") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBindingTest.kt index 3fc84ea6..3d185712 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBindingTest.kt @@ -1,8 +1,9 @@ package com.asyncapi.v2.binding.operation.kafka +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.schema.Type +import com.asyncapi.v3.schema.AsyncAPISchema class KafkaOperationBindingTest: SerDeTest() { @@ -16,11 +17,11 @@ class KafkaOperationBindingTest: SerDeTest() { override fun build(): KafkaOperationBinding { return KafkaOperationBinding.builder() - .groupId(Schema.builder() + .groupId(AsyncAPISchema.builder() .type(Type.STRING) .enumValue(listOf("myGroupId")) .build()) - .clientId(Schema.builder() + .clientId(AsyncAPISchema.builder() .type(Type.STRING) .enumValue(listOf("myClientId")) .build()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBindingTest.kt index 8c73a5ab..ad7cc167 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.server.ibmmq import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding /** * @version 2.6.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/kafka/KafkaServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/kafka/KafkaServerBindingTest.kt index 0e9910ce..fe930e6c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/kafka/KafkaServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/kafka/KafkaServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2.binding.server.kafka import com.asyncapi.v2.SerDeTest +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding /** * @version 2.6.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index f09a5788..808155f3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -4,14 +4,14 @@ import com.asyncapi.v3.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.Tag -import com.asyncapi.v3.binding.server.amqp1.AMQP1ServerBinding -import com.asyncapi.v3.binding.server.anypointmq.AnypointMQServerBinding -import com.asyncapi.v3.binding.server.googlepubsub.GooglePubSubServerBinding -import com.asyncapi.v3.binding.server.http.HTTPServerBinding -import com.asyncapi.v3.binding.server.ibmmq.IBMMQServerBinding -import com.asyncapi.v3.binding.server.jms.JMSServerBinding -import com.asyncapi.v3.binding.server.kafka.KafkaServerBinding -import com.asyncapi.v3.binding.server.mercure.MercureServerBinding +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding +import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding +import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding +import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding @@ -96,7 +96,9 @@ class ServerTest: SerDeTest() { .schemaRegistryVendor("confluent") .build() ), - Pair("mercure", MercureServerBinding()), + Pair("mercure", + MercureServerBinding() + ), Pair( "mqtt", MQTTServerBinding.builder() @@ -209,7 +211,9 @@ class ServerTestWithReference: SerDeTest() { .schemaRegistryVendor("confluent") .build() ), - Pair("mercure", MercureServerBinding()), + Pair("mercure", + MercureServerBinding() + ), Pair( "mqtt", MQTTServerBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBindingTest.kt index f45456ca..05dc96ab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBindingTest.kt @@ -1,9 +1,11 @@ package com.asyncapi.v3.binding.channel.amqp import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.binding.channel.amqp.exchange.AMQPChannelExchangeProperties -import com.asyncapi.v3.binding.channel.amqp.exchange.AMQPChannelExchangeType -import com.asyncapi.v3.binding.channel.amqp.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeProperties +import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeType +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt index a345ee89..40fc730c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt @@ -1,6 +1,8 @@ package com.asyncapi.v3.binding.channel.anypointmq import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelDestinationType /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt index e4e85536..06cc8361 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt @@ -1,6 +1,9 @@ package com.asyncapi.v3.binding.channel.googlepubsub import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelMessageStoragePolicy +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelSchemaSettings class GooglePubSubChannelBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBindingTest.kt index 44b62126..a5768853 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBindingTest.kt @@ -1,6 +1,10 @@ package com.asyncapi.v3.binding.channel.ibmmq import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelDestinationType +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelQueueProperties +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelTopicProperties class IBMMQChannelBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBindingTest.kt index 6b53ef17..eac29010 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBindingTest.kt @@ -1,6 +1,9 @@ package com.asyncapi.v3.binding.channel.kafka import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicCleanupPolicy +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguration /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/amqp/AMQPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/amqp/AMQPMessageBindingTest.kt index 46ce1df5..2edab852 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/amqp/AMQPMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/amqp/AMQPMessageBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.message.amqp import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding class AMQPMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt index be3c7be8..4fc41561 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt @@ -3,6 +3,7 @@ package com.asyncapi.v3.binding.message.anypointmq import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding class AnypointMQMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt index 201aa44e..3390e0e3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt @@ -1,6 +1,9 @@ package com.asyncapi.v3.binding.message.googlepubsub import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinition +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinitionType class GooglePubSubMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/http/HTTPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/http/HTTPMessageBindingTest.kt index 7b7ef2c5..cd723da1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/http/HTTPMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/http/HTTPMessageBindingTest.kt @@ -3,6 +3,7 @@ package com.asyncapi.v3.binding.message.http import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding class HTTPMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBindingTest.kt index 4924a3e5..1c6d4817 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBindingTest.kt @@ -1,6 +1,8 @@ package com.asyncapi.v3.binding.message.ibmmq import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageType class IBMMQMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/kafka/KafkaMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/kafka/KafkaMessageBindingTest.kt index 1cf3e5b4..84eae1a7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/kafka/KafkaMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/kafka/KafkaMessageBindingTest.kt @@ -3,6 +3,8 @@ package com.asyncapi.v3.binding.message.kafka import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageSchemaIdLocation class KafkaMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBindingTest.kt index 0fc26178..99cac152 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.operation.amqp import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding class AMQPOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/http/HTTPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/http/HTTPOperationBindingTest.kt index 14990d90..ac67acae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/http/HTTPOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/http/HTTPOperationBindingTest.kt @@ -3,6 +3,9 @@ package com.asyncapi.v3.binding.operation.http import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod import java.math.BigDecimal class HTTPOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBindingTest.kt index ab88192f..7c176bb8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBindingTest.kt @@ -3,6 +3,7 @@ package com.asyncapi.v3.binding.operation.kafka import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding class KafkaOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBindingTest.kt index 67670a7b..57004b2c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.server.ibmmq import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/kafka/KafkaServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/kafka/KafkaServerBindingTest.kt index dea2146f..1bb282ec 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/kafka/KafkaServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/kafka/KafkaServerBindingTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.binding.server.kafka import com.asyncapi.v3.SerDeTest +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 54f14085..b2e6d070 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -134,14 +134,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -161,14 +160,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -191,42 +189,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -235,14 +243,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -265,31 +272,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -312,21 +323,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -414,14 +430,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -441,14 +456,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -471,42 +485,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -515,14 +539,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -545,31 +568,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -592,21 +619,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -697,14 +729,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -724,14 +755,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -754,42 +784,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -798,14 +838,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -828,31 +867,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -875,21 +918,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -977,14 +1025,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1004,14 +1051,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1034,42 +1080,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1078,14 +1134,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1108,31 +1163,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1155,21 +1214,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -1540,14 +1604,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "object", + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, + "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1567,14 +1630,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1597,42 +1659,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -1647,14 +1719,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1674,14 +1745,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1704,42 +1774,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1753,14 +1833,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1783,21 +1862,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -2808,14 +2892,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2835,14 +2918,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2865,42 +2947,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -2915,14 +3007,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2942,14 +3033,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2972,42 +3062,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -3021,14 +3121,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3051,21 +3150,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -3301,14 +3405,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3328,14 +3431,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3358,42 +3460,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -3402,14 +3514,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3432,31 +3543,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3479,21 +3594,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -3724,14 +3844,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3751,14 +3870,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3781,42 +3899,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -3831,14 +3959,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3858,14 +3985,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3888,42 +4014,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -3937,14 +4073,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3967,21 +4102,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -4394,14 +4534,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4421,14 +4560,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4451,42 +4589,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -4495,14 +4643,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4525,31 +4672,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4572,21 +4723,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -4644,14 +4800,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4671,14 +4826,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4701,42 +4855,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -4751,14 +4915,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4778,14 +4941,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4808,42 +4970,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -4857,14 +5029,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4887,21 +5058,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index eefc3c81..94a21f1a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -38,14 +38,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -65,14 +64,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -95,42 +93,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -139,14 +147,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -169,31 +176,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -216,21 +227,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -318,14 +334,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -345,14 +360,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -375,42 +389,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -419,14 +443,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -449,31 +472,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -496,21 +523,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -601,14 +633,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -628,14 +659,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -658,42 +688,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -702,14 +742,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -732,31 +771,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -779,21 +822,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -881,14 +929,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -908,14 +955,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -938,42 +984,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -982,14 +1038,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1012,31 +1067,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1059,21 +1118,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -1444,14 +1508,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1471,14 +1534,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1501,42 +1563,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -1551,14 +1623,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1578,14 +1649,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1608,42 +1678,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1657,14 +1737,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1687,21 +1766,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 380e43d9..9011f529 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -319,14 +319,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -346,14 +345,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -376,42 +374,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -426,14 +434,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -453,14 +460,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -483,42 +489,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -532,14 +548,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -562,21 +577,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 4b07b742..fba1e181 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -177,14 +177,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -204,14 +203,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -234,42 +232,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -284,14 +292,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -311,14 +318,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -341,42 +347,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -390,14 +406,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -420,21 +435,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 2e2e5a52..4f5bf672 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -35,14 +35,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -62,14 +61,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -92,42 +90,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -136,14 +144,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -166,31 +173,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -213,21 +224,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -315,14 +331,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -342,14 +357,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -372,42 +386,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -416,14 +440,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -446,31 +469,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -493,21 +520,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -878,14 +910,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -905,14 +936,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -935,42 +965,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -985,14 +1025,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1012,14 +1051,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1042,42 +1080,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1091,14 +1139,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1121,21 +1168,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index 93bf31ad..0a552e6d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -35,14 +35,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -62,14 +61,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -92,42 +90,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -136,14 +144,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -166,31 +173,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -213,21 +224,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -315,14 +331,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -342,14 +357,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -372,42 +386,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -416,14 +440,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -446,31 +469,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -493,21 +520,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index abf502d1..6c1ec246 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -35,14 +35,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -62,14 +61,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -92,42 +90,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -136,14 +144,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -166,31 +173,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -213,21 +224,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index ea802ebf..c57a86b1 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -610,14 +610,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -637,14 +636,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -667,42 +665,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -717,14 +725,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -744,14 +751,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -774,42 +780,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -823,14 +839,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -853,21 +868,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -1103,14 +1123,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1130,14 +1149,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1160,42 +1178,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1204,14 +1232,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1234,38 +1261,42 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, + "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, + "multipleOf" : null, + "maximum" : null, + "exclusiveMaximum" : null, + "minimum" : null, + "exclusiveMinimum" : null, + "maxLength" : null, + "minLength" : null, "pattern" : null, "items" : null, "additionalItems" : null, @@ -1281,21 +1312,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -1526,14 +1562,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1553,14 +1588,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1583,42 +1617,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -1633,14 +1677,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1660,14 +1703,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1690,42 +1732,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1739,14 +1791,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1769,21 +1820,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -2196,14 +2252,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2223,14 +2278,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2253,42 +2307,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -2297,14 +2361,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2327,31 +2390,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2374,21 +2441,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { }, @@ -2446,14 +2518,13 @@ "amqp1" : { }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2473,14 +2544,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2503,42 +2573,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -2553,14 +2633,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2580,14 +2659,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2610,42 +2688,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -2659,14 +2747,13 @@ "jms" : { }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2689,21 +2776,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index c13ccf91..8109084e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -157,14 +157,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -184,14 +183,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -214,42 +212,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -262,14 +270,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -292,31 +299,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -339,21 +350,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -466,14 +482,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -493,14 +508,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -523,42 +537,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -571,14 +595,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -601,31 +624,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -648,21 +675,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -1055,14 +1087,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1082,14 +1113,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1112,42 +1142,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -1162,14 +1202,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1189,14 +1228,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1219,42 +1257,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1270,14 +1318,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1300,21 +1347,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -1423,14 +1475,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1450,14 +1501,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1480,42 +1530,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1528,14 +1588,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1558,31 +1617,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "clientId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1605,21 +1668,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -1732,14 +1800,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1759,14 +1826,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1789,42 +1855,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1837,14 +1913,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1867,31 +1942,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1914,21 +1993,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -2318,14 +2402,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2345,14 +2428,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2375,42 +2457,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -2425,14 +2517,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2452,14 +2543,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2482,42 +2572,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "readOnly" : null, + "writeOnly" : null, + "examples" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -2533,14 +2633,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2563,21 +2662,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -3464,14 +3568,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3491,14 +3594,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3521,42 +3623,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -3569,14 +3681,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3599,31 +3710,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3646,21 +3761,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -3773,14 +3893,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3800,14 +3919,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3830,42 +3948,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -3878,14 +4006,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3908,31 +4035,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3955,21 +4086,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -4362,14 +4498,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4389,14 +4524,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4419,42 +4553,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -4469,14 +4613,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4496,14 +4639,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4526,42 +4668,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -4577,14 +4729,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4607,21 +4758,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -4730,14 +4886,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4757,14 +4912,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4787,42 +4941,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -4835,14 +4999,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4865,31 +5028,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4912,21 +5079,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -5039,14 +5211,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5066,14 +5237,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5096,42 +5266,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -5144,14 +5324,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5174,31 +5353,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5221,21 +5404,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -5625,14 +5813,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5652,14 +5839,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5682,42 +5868,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -5732,14 +5928,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5759,14 +5954,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5789,42 +5983,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -5840,14 +6044,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5870,21 +6073,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -6655,14 +6863,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -6682,14 +6889,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -6712,42 +6918,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -6762,14 +6978,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -6789,14 +7004,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -6819,42 +7033,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -6870,16 +7094,15 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, + "type" : "string", + "enum" : [ "myKey" ], + "const" : null, + "multipleOf" : null, + "maximum" : null, "exclusiveMaximum" : null, "minimum" : null, "exclusiveMinimum" : null, @@ -6900,21 +7123,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -7191,14 +7419,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -7218,14 +7445,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -7248,42 +7474,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -7296,14 +7532,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -7326,31 +7561,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -7373,21 +7612,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -7640,14 +7884,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -7667,14 +7910,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -7697,42 +7939,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -7747,14 +7999,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -7774,14 +8025,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -7804,42 +8054,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -7855,14 +8115,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -7885,21 +8144,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -8370,14 +8634,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8397,14 +8660,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8427,42 +8689,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -8475,14 +8747,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8505,31 +8776,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8552,21 +8827,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -8642,14 +8922,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8669,14 +8948,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8699,42 +8977,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -8749,14 +9037,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8776,14 +9063,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8806,42 +9092,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -8857,14 +9153,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -8887,21 +9182,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json index fa62ca2b..81545797 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json @@ -47,14 +47,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -74,14 +73,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -104,42 +102,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -152,14 +160,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -182,31 +189,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -229,21 +240,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -356,14 +372,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -383,14 +398,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -413,42 +427,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -461,14 +485,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -491,31 +514,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -538,21 +565,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -945,14 +977,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -972,14 +1003,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1002,42 +1032,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -1052,14 +1092,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1079,14 +1118,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1109,42 +1147,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1160,14 +1208,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1190,21 +1237,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -1313,14 +1365,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1340,14 +1391,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1370,42 +1420,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1418,14 +1478,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1448,31 +1507,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1495,21 +1558,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -1622,14 +1690,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1649,14 +1716,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1679,42 +1745,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1727,14 +1803,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1757,31 +1832,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1804,21 +1883,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -2208,14 +2292,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2235,14 +2318,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2265,42 +2347,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -2315,14 +2407,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2342,14 +2433,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2372,42 +2462,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -2423,14 +2523,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2453,21 +2552,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json index 4d8872fd..00ff8fd4 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json @@ -322,14 +322,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -349,14 +348,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -379,42 +377,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -429,14 +437,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -456,14 +463,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -486,42 +492,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -537,14 +553,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -567,21 +582,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json index 90e1ddeb..eb118fe5 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json @@ -180,14 +180,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -207,14 +206,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -237,42 +235,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -287,14 +295,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -314,14 +321,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -344,42 +350,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -395,14 +411,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -425,21 +440,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json index 6c8ef4d1..b62d429d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json @@ -44,14 +44,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -71,14 +70,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -101,42 +99,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -149,14 +157,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -179,31 +186,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -226,21 +237,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -353,14 +369,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -380,14 +395,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -410,42 +424,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -458,14 +482,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -488,31 +511,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -535,21 +562,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -939,14 +971,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -966,14 +997,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -996,42 +1026,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -1046,14 +1086,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1073,14 +1112,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1103,42 +1141,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1154,14 +1202,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1184,21 +1231,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json index 3d6bd371..2ddef9ce 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json @@ -44,14 +44,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -71,14 +70,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -101,42 +99,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -149,14 +157,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -179,31 +186,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -226,21 +237,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -353,14 +369,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -380,14 +395,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -410,42 +424,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -458,14 +482,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -488,31 +511,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -535,21 +562,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -942,14 +974,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -969,14 +1000,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -999,42 +1029,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -1049,14 +1089,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1076,14 +1115,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1106,42 +1144,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1157,14 +1205,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1187,21 +1234,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json index 3ba03711..eb19969a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json @@ -44,14 +44,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -71,14 +70,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -101,42 +99,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -149,14 +157,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -179,31 +186,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -226,21 +237,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -353,14 +369,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -380,14 +395,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -410,42 +424,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -458,14 +482,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -488,31 +511,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -535,21 +562,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json index 2f5df643..ba4ea333 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json @@ -44,14 +44,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -71,14 +70,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -101,42 +99,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -149,14 +157,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -179,31 +186,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -226,21 +237,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 80a2150e..6a3c1ba9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -439,14 +439,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -466,14 +465,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -496,42 +494,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -544,14 +552,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -574,31 +581,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -621,21 +632,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -748,14 +764,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -775,14 +790,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -805,42 +819,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -853,14 +877,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -883,31 +906,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -930,21 +957,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -1337,14 +1369,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1364,14 +1395,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1394,42 +1424,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -1444,14 +1484,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1471,14 +1510,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1501,42 +1539,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1552,14 +1600,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1582,21 +1629,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -1705,14 +1757,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1732,14 +1783,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1762,42 +1812,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -1810,14 +1870,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1840,31 +1899,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -1887,21 +1950,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -2014,14 +2082,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2041,14 +2108,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2071,42 +2137,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -2119,14 +2195,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2149,31 +2224,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2196,21 +2275,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -2600,14 +2684,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2627,14 +2710,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2657,42 +2739,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -2707,14 +2799,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2734,14 +2825,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2764,42 +2854,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -2815,14 +2915,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -2845,21 +2944,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -3630,14 +3734,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3657,14 +3760,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3687,42 +3789,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -3737,14 +3849,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3764,14 +3875,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3794,42 +3904,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -3845,14 +3965,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -3875,21 +3994,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -4166,14 +4290,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4193,14 +4316,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4223,42 +4345,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -4271,14 +4403,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4301,31 +4432,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4348,21 +4483,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -4615,14 +4755,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4642,14 +4781,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4672,42 +4810,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -4722,14 +4870,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4749,14 +4896,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4779,42 +4925,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -4830,14 +4986,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -4860,21 +5015,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", @@ -5345,14 +5505,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5372,14 +5531,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5402,42 +5560,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -5450,14 +5618,13 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5480,31 +5647,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5527,21 +5698,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "mercure" : { @@ -5617,14 +5793,13 @@ }, "anypointmq" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5644,14 +5819,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5674,42 +5848,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1" }, @@ -5724,14 +5908,13 @@ }, "http" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5751,14 +5934,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5781,42 +5963,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0" }, @@ -5832,14 +6024,13 @@ }, "kafka" : { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -5862,21 +6053,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json index 32f0633d..a331d70d 100644 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json @@ -1,13 +1,12 @@ { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -27,14 +26,13 @@ "required" : null, "properties" : { "correlationId" : { - "title" : null, - "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -57,42 +55,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "Correlation ID set by application", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.0.1", "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - extended.json index 506a4b29..d89df15a 100644 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - extended.json @@ -1,13 +1,12 @@ { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -27,14 +26,13 @@ "required" : null, "properties" : { "Content-Type" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "application/json" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -57,42 +55,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "application/json" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0", "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - extended.json index 8a8f68ce..3fd78ce6 100644 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - extended.json @@ -1,13 +1,12 @@ { "key" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myKey" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -30,21 +29,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myKey" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - extended.json index d114cb25..75104850 100644 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - extended.json @@ -2,14 +2,13 @@ "type" : "request", "method" : "GET", "query" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "object", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -29,14 +28,13 @@ "required" : [ "companyId" ], "properties" : { "companyId" : { - "title" : null, - "description" : "The Id of the company.", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "number", + "enum" : null, + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -59,42 +57,52 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : "The Id of the company.", + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null } }, "patternProperties" : null, "additionalProperties" : false, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "bindingVersion" : "0.1.0", "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - extended.json index 9dbacd7c..f210b50f 100644 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - extended.json @@ -1,14 +1,13 @@ { "bindingVersion" : "0.4.0", "groupId" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myGroupId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -31,31 +30,35 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myGroupId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null - }, - "clientId" : { + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, "title" : null, "description" : null, + "default" : null, "readOnly" : null, "writeOnly" : null, "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, + "discriminator" : null, + "externalDocs" : null, + "deprecated" : null + }, + "clientId" : { + "$id" : null, + "$schema" : null, + "$ref" : null, + "$comment" : null, "type" : "string", + "enum" : [ "myClientId" ], + "const" : null, "multipleOf" : null, "maximum" : null, "exclusiveMaximum" : null, @@ -78,21 +81,26 @@ "additionalProperties" : null, "dependencies" : null, "propertyNames" : null, + "if" : null, + "then" : null, + "else" : null, "allOf" : null, "anyOf" : null, "oneOf" : null, "not" : null, "format" : null, + "contentEncoding" : null, + "contentMediaType" : null, + "definitions" : null, + "title" : null, + "description" : null, + "default" : null, + "readOnly" : null, + "writeOnly" : null, + "examples" : null, "discriminator" : null, "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : [ "myClientId" ], - "const" : null, - "if" : null, - "then" : null, - "else" : null + "deprecated" : null }, "x-number" : 0, "x-string" : "", From 34759663eb20abf8d6117d1a98897b0c52b40259 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 23 Apr 2024 01:40:57 +0400 Subject: [PATCH 021/141] feat(bindings): use common bindings deserializer https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/173 https://github.com/asyncapi/jasyncapi/issues/172 https://github.com/asyncapi/jasyncapi/issues/171 https://github.com/asyncapi/jasyncapi/issues/170 https://github.com/asyncapi/jasyncapi/issues/169 https://github.com/asyncapi/jasyncapi/issues/168 https://github.com/asyncapi/jasyncapi/issues/167 https://github.com/asyncapi/jasyncapi/issues/166 --- .../java/com/asyncapi/{v3 => }/Reference.java | 2 +- .../BindingsMapDeserializer.java | 2 +- .../ChannelBindingsDeserializer.java | 5 +- .../MessageBindingsDeserializer.java | 5 +- .../OperationBindingsDeserializer.java | 5 +- .../ServerBindingsDeserializer.java | 5 +- .../main/java/com/asyncapi/v2/Reference.java | 38 --- .../ChannelParametersDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../OperationMessageDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- .../v2/_0_0/model/channel/ChannelItem.java | 4 +- .../_0_0/model/channel/message/Message.java | 4 +- .../model/channel/message/MessageTrait.java | 4 +- .../model/channel/operation/Operation.java | 4 +- .../channel/operation/OperationTrait.java | 2 +- .../v2/_0_0/model/component/Components.java | 10 +- .../asyncapi/v2/_0_0/model/server/Server.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../channel/message/MessagesDeserializer.java | 2 +- .../OperationMessageDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../ComponentsCorrelationIdsDeserializer.java | 2 +- .../ComponentsMessageTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- ...ComponentsOperationTraitsDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- ...ComponentsServerVariablesDeserializer.java | 2 +- .../ComponentsServersDeserializer.java | 2 +- .../model/schema/SchemaDeserializer.java | 2 +- .../server/ServerVariablesDeserializer.java | 2 +- .../model/server/ServersDeserializer.java | 2 +- .../com/asyncapi/v2/_6_0/model/AsyncAPI.java | 2 +- .../v2/_6_0/model/channel/ChannelItem.java | 6 +- .../v2/_6_0/model/channel/Parameter.java | 2 +- .../_6_0/model/channel/message/Message.java | 10 +- .../model/channel/message/MessageTrait.java | 8 +- .../model/channel/message/OneOfMessages.java | 2 +- .../model/channel/operation/Operation.java | 8 +- .../channel/operation/OperationTrait.java | 4 +- .../v2/_6_0/model/component/Components.java | 34 +-- .../asyncapi/v2/_6_0/model/server/Server.java | 6 +- .../channel/ChannelBindingsDeserializer.java | 68 ----- .../message/MessageBindingsDeserializer.java | 68 ----- .../OperationBindingsDeserializer.java | 69 ----- .../server/ServerBindingsDeserializer.java | 70 ----- .../ExternalDocumentationDeserializer.java | 2 +- .../_0_0/jackson/model/TagsDeserializer.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../model/channel/ChannelsDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessagePayloadDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../channel/message/MessagesDeserializer.java | 2 +- .../ComponentsChannelsDeserializer.java | 2 +- .../ComponentsCorrelationIdsDeserializer.java | 2 +- .../ComponentsExternalDocsDeserializer.java | 2 +- .../ComponentsMessageTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- ...ComponentsOperationTraitsDeserializer.java | 2 +- .../ComponentsOperationsDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsRepliesDeserializer.java | 2 +- .../ComponentsReplyAddressesDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- ...ComponentsServerVariablesDeserializer.java | 2 +- .../ComponentsServersDeserializer.java | 2 +- .../component/ComponentsTagsDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../operation/OperationsDeserializer.java | 2 +- .../OperationReplyAddressDeserializer.java | 2 +- .../reply/OperationReplyDeserializer.java | 2 +- .../server/ServerVariablesDeserializer.java | 2 +- .../model/server/ServersDeserializer.java | 2 +- .../com/asyncapi/v3/_0_0/model/AsyncAPI.java | 2 +- .../java/com/asyncapi/v3/_0_0/model/Tag.java | 2 +- .../v3/_0_0/model/channel/Channel.java | 4 +- .../_0_0/model/channel/message/Message.java | 16 +- .../model/channel/message/MessageTrait.java | 12 +- .../v3/_0_0/model/component/Components.java | 10 +- .../com/asyncapi/v3/_0_0/model/info/Info.java | 2 +- .../v3/_0_0/model/operation/Operation.java | 4 +- .../_0_0/model/operation/OperationTrait.java | 6 +- .../model/operation/reply/OperationReply.java | 2 +- .../asyncapi/v3/_0_0/model/server/Server.java | 4 +- .../v3/jackson/BindingsMapDeserializer.java | 44 --- .../SecuritySchemesDeserializer.java | 2 +- .../_9_0/jackson/AvroSchemaDeserializer.java | 2 +- .../schema/multiformat/AvroFormatSchema.java | 5 +- .../schema/multiformat/MultiFormatSchema.java | 5 +- .../com/asyncapi/examples/v2/_0_0/AnyOf.kt | 2 +- .../examples/v2/_0_0/ApplicationHeaders.kt | 2 +- .../examples/v2/_0_0/CorrelationId.kt | 2 +- .../examples/v2/_0_0/GitterStreaming.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/Mercure.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/Not.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/OneOf.kt | 2 +- .../examples/v2/_0_0/OperationSecurity.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/Simple.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/SlackRtm.kt | 2 +- .../examples/v2/_0_0/StreetlightsKafka.kt | 2 +- .../examples/v2/_0_0/StreetlightsMQTT.kt | 2 +- .../v2/_0_0/StreetlightsOperationSecurity.kt | 2 +- .../examples/v2/_0_0/WebsocketGemini.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/AnyOf.kt | 2 +- .../examples/v2/_6_0/ApplicationHeaders.kt | 2 +- .../examples/v2/_6_0/CorrelationId.kt | 2 +- .../examples/v2/_6_0/GitterStreaming.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/Mercure.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/Not.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/OneOf.kt | 2 +- .../examples/v2/_6_0/OperationSecurity.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/Simple.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/SlackRtm.kt | 2 +- .../examples/v2/_6_0/StreetlightsKafka.kt | 2 +- .../examples/v2/_6_0/StreetlightsMQTT.kt | 2 +- .../v2/_6_0/StreetlightsOperationSecurity.kt | 2 +- .../examples/v2/_6_0/WebsocketGemini.kt | 2 +- .../v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt | 18 +- .../examples/v3/_0_0/AnyOfAsyncAPI.kt | 6 +- .../v3/_0_0/ApplicationHeadersAsyncAPI.kt | 12 +- .../examples/v3/_0_0/CorrelationIdAsyncAPI.kt | 26 +- .../v3/_0_0/GitterStreamingAsyncAPI.kt | 16 +- ...equestReplyMessageFilterInReplyAsyncAPI.kt | 46 ++- ...ketRequestReplyMultipleChannelsAsyncAPI.kt | 40 ++- .../examples/v3/_0_0/MercureAsyncAPI.kt | 10 +- .../asyncapi/examples/v3/_0_0/NotAsyncAPI.kt | 6 +- .../examples/v3/_0_0/OneOfAsyncAPI.kt | 22 +- .../v3/_0_0/OperationSecurityAsyncAPI.kt | 8 +- .../examples/v3/_0_0/RpcClientAsyncAPI.kt | 6 +- .../examples/v3/_0_0/RpcServerAsyncAPI.kt | 6 +- .../examples/v3/_0_0/SimpleAsyncAPI.kt | 8 +- .../examples/v3/_0_0/SlackRtmAsyncAPI.kt | 286 ++++++++++++------ .../v3/_0_0/StreetlightsKafkaAsyncAPI.kt | 36 ++- .../v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 38 ++- .../StreetlightsOperationSecurityAsyncAPI.kt | 34 ++- .../v3/_0_0/WebsocketGeminiAsyncAPI.kt | 8 +- .../asyncapi/v2/_0_0/model/ReferenceTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../v2/_0_0/model/component/ComponentsTest.kt | 2 +- .../asyncapi/v2/_6_0/model/AsyncAPITest.kt | 2 +- .../asyncapi/v2/_6_0/model/ReferenceTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 2 +- .../v2/_6_0/model/channel/ParameterTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../channel/message/OneOfMessagesTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_6_0/model/component/ComponentsTest.kt | 2 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../asyncapi/v3/_0_0/model/AsyncAPITest.kt | 6 +- .../asyncapi/v3/_0_0/model/ReferenceTest.kt | 2 +- .../com/asyncapi/v3/_0_0/model/TagTest.kt | 4 +- .../v3/_0_0/model/channel/ChannelTest.kt | 34 ++- .../_0_0/model/channel/message/MessageTest.kt | 14 +- .../model/channel/message/MessageTraitTest.kt | 18 +- .../v3/_0_0/model/component/ComponentsTest.kt | 54 +++- .../asyncapi/v3/_0_0/model/info/InfoTest.kt | 4 +- .../v3/_0_0/model/operation/OperationTest.kt | 50 +-- .../model/operation/OperationTraitTest.kt | 43 ++- .../operation/reply/OperationReplyTest.kt | 14 +- .../v3/_0_0/model/server/ServerTest.kt | 14 +- 177 files changed, 798 insertions(+), 866 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3 => }/Reference.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/jackson => bindings}/BindingsMapDeserializer.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/binding/channel => bindings}/ChannelBindingsDeserializer.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/binding/message => bindings}/MessageBindingsDeserializer.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/binding/operation => bindings}/OperationBindingsDeserializer.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/binding/server => bindings}/ServerBindingsDeserializer.java (96%) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/Reference.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/jackson/BindingsMapDeserializer.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/Reference.java b/asyncapi-core/src/main/java/com/asyncapi/Reference.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/Reference.java rename to asyncapi-core/src/main/java/com/asyncapi/Reference.java index 05ac7c2f..6ceb9241 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/Reference.java +++ b/asyncapi-core/src/main/java/com/asyncapi/Reference.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3; +package com.asyncapi; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/BindingsMapDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/BindingsMapDeserializer.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v2/jackson/BindingsMapDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/BindingsMapDeserializer.java index 7b78380f..8e391b6e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/BindingsMapDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/BindingsMapDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.jackson; +package com.asyncapi.bindings; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 8c72359b..ec7a235b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/channel/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -1,6 +1,5 @@ -package com.asyncapi.v3.jackson.binding.channel; +package com.asyncapi.bindings; -import com.asyncapi.v3.Reference; import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding; import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; @@ -20,7 +19,7 @@ import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; -import com.asyncapi.v3.jackson.BindingsMapDeserializer; +import com.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index fa4737d7..f817f2fb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/message/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -1,6 +1,5 @@ -package com.asyncapi.v3.jackson.binding.message; +package com.asyncapi.bindings; -import com.asyncapi.v3.Reference; import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding; import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; @@ -20,7 +19,7 @@ import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; -import com.asyncapi.v3.jackson.BindingsMapDeserializer; +import com.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 8128a462..4a0b19ab 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/operation/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -1,6 +1,5 @@ -package com.asyncapi.v3.jackson.binding.operation; +package com.asyncapi.bindings; -import com.asyncapi.v3.Reference; import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding; import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; @@ -20,7 +19,7 @@ import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; -import com.asyncapi.v3.jackson.BindingsMapDeserializer; +import com.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 99369733..142818a4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/binding/server/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -1,6 +1,5 @@ -package com.asyncapi.v3.jackson.binding.server; +package com.asyncapi.bindings; -import com.asyncapi.v3.Reference; import com.asyncapi.bindings.amqp.v0._2_0.server.AMQPServerBinding; import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; @@ -20,7 +19,7 @@ import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; -import com.asyncapi.v3.jackson.BindingsMapDeserializer; +import com.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/Reference.java b/asyncapi-core/src/main/java/com/asyncapi/v2/Reference.java deleted file mode 100644 index d7b447b2..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/Reference.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.asyncapi.v2; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; - -/** - * A simple object to allow referencing other components in the specification, internally and externally. - *

- * The Reference Object is defined by JSON Reference and follows the same structure, behavior and rules. - * A JSON Reference SHALL only be used to refer to a schema that is formatted in either JSON or YAML. - * In the case of a YAML-formatted Schema, the JSON Reference SHALL be applied to the JSON representation of - * that schema. The JSON representation SHALL be made by applying the conversion described here. - *

- * For this specification, reference resolution is done as defined by the JSON Reference specification and not by - * the JSON Schema specification. - * - * @version 2.6.0 - * @see Reference - * @author Pavel Bodiachevskii - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class Reference { - - /** - * Required. - *

- * The reference string. - */ - @NotNull - @JsonProperty(value = "$ref") - private String ref = ""; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java index c702a0ca..89c3cba4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index b5dbd0ff..66df0b3c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.CorrelationId; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index e7b62788..d790aa00 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java index e80a6148..225de3b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java index 8f59c963..387975fd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.operation; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java index 185e271f..7a6ebe60 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.operation; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java index 06783ee3..f0abd1f4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java index 1471ce0c..fe984f4d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index 168d7dd1..44694440 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index 91c7d16e..e837e0b2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; import com.asyncapi.v2.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java index 3e4a5a90..5b5376ac 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java @@ -2,10 +2,10 @@ import com.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.ChannelParametersDeserializer; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.operation.Operation; import com.asyncapi.bindings.ChannelBinding; -import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; +import com.asyncapi.bindings.ChannelBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java index cc05b578..16375f26 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java @@ -6,11 +6,11 @@ import com.asyncapi.v2._0_0.jackson.model.channel.message.MessagePayloadDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageTraitsDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2.schema.Schema; import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; +import com.asyncapi.bindings.MessageBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java index d7553972..5430ee24 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java @@ -4,12 +4,12 @@ import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.schema.Schema; import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; +import com.asyncapi.bindings.MessageBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java index c6d1afc5..74045860 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java @@ -4,11 +4,11 @@ import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationMessageDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationTraitsDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; +import com.asyncapi.bindings.OperationBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java index 73326976..1ec0ee80 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java @@ -5,7 +5,7 @@ import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; +import com.asyncapi.bindings.OperationBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java index 5b8e458c..3d8504b3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java @@ -5,7 +5,7 @@ import com.asyncapi.v2._0_0.jackson.model.component.ComponentsParametersDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsSchemasDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsSecuritySchemesDeserializer; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; import com.asyncapi.v2._0_0.model.channel.message.CorrelationId; import com.asyncapi.v2._0_0.model.channel.message.Message; @@ -16,10 +16,10 @@ import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.ServerBinding; -import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; -import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; -import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; -import com.asyncapi.v2.jackson.binding.server.ServerBindingsDeserializer; +import com.asyncapi.bindings.ChannelBindingsDeserializer; +import com.asyncapi.bindings.MessageBindingsDeserializer; +import com.asyncapi.bindings.OperationBindingsDeserializer; +import com.asyncapi.bindings.ServerBindingsDeserializer; import com.asyncapi.v2.security_scheme.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java index d1ad9e85..5628df92 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java @@ -2,7 +2,7 @@ import com.asyncapi.ExtendableObject; import com.asyncapi.bindings.ServerBinding; -import com.asyncapi.v2.jackson.binding.server.ServerBindingsDeserializer; +import com.asyncapi.bindings.ServerBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java index 9bdc2bad..97d89c17 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index 03003e13..bd1e36bd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.CorrelationId; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 0fa2e91a..1e71daa3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java index 14099ba2..2ba422f3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.MessageTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java index 12643960..0133c93f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java index cccadb79..b8a8fa08 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.operation; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java index 73df461f..428468ea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.operation; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java index 8a371a57..57318d08 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.CorrelationId; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java index 4b74a8f7..9b782ba8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.MessageTrait; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java index 17e779e2..fb569307 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java index f9f33397..ee5fccb2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java index e11cc46f..9f601a6d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java index d6dd235c..a66c2df8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index 8b045902..0957e7f2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; import com.asyncapi.v2.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java index 1b056b6f..265d1cdf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.ServerVariable; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java index b7a7c2fc..07fde4a2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.Server; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java index 81940260..6cc5654d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.schema; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java index 9611dfad..ee6f0131 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.server; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.ServerVariable; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java index 17053961..51b0a8b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.server; -import com.asyncapi.v2.Reference; +import com.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.Server; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java index c8106f81..863d6809 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java @@ -76,7 +76,7 @@ public class AsyncAPI extends ExtendableObject { * MUST BE: *

*/ @Nullable diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java index 863f123c..39a7a17a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java @@ -4,7 +4,7 @@ import com.asyncapi.v2._6_0.jackson.model.channel.ChannelParametersDeserializer; import com.asyncapi.v2._6_0.model.channel.operation.Operation; import com.asyncapi.bindings.ChannelBinding; -import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; +import com.asyncapi.bindings.ChannelBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; @@ -73,7 +73,7 @@ public class ChannelItem extends ExtendableObject { *

* MUST BE: *

*/ @@ -86,7 +86,7 @@ public class ChannelItem extends ExtendableObject { *

* MUST BE: *

*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java index 04c449ee..adbe82c0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java @@ -35,7 +35,7 @@ public class Parameter extends ExtendableObject { *

* MUST BE: *

*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java index 203c7627..4358f777 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java @@ -8,7 +8,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; +import com.asyncapi.bindings.MessageBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; @@ -51,7 +51,7 @@ public class Message extends ExtendableObject { * MUST BE: * */ @Nullable @@ -78,7 +78,7 @@ public class Message extends ExtendableObject { * MUST BE: * */ @Nullable @@ -149,7 +149,7 @@ public class Message extends ExtendableObject { *

* MUST BE: *

*/ @@ -170,7 +170,7 @@ public class Message extends ExtendableObject { *

* MUST BE: *

*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java index e669078b..df479f84 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; +import com.asyncapi.bindings.MessageBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; @@ -55,7 +55,7 @@ public class MessageTrait extends ExtendableObject { * MUST BE: * */ @Nullable @@ -68,7 +68,7 @@ public class MessageTrait extends ExtendableObject { * MUST BE: * */ @Nullable @@ -139,7 +139,7 @@ public class MessageTrait extends ExtendableObject { *

* MUST BE: *

*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java index 4261338f..71e7fdd9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java @@ -26,7 +26,7 @@ public class OneOfMessages { * Given message MUST be one of provided messages. * * */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java index e1eb3a4b..92156883 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; +import com.asyncapi.bindings.OperationBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; @@ -87,7 +87,7 @@ public class Operation extends ExtendableObject { *

* MUST BE: *

*/ @@ -101,7 +101,7 @@ public class Operation extends ExtendableObject { *

* MUST BE: *

*/ @@ -116,7 +116,7 @@ public class Operation extends ExtendableObject { *

* MUST BE: *

diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java index 8c87ae76..60625035 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java @@ -4,7 +4,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; +import com.asyncapi.bindings.OperationBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; @@ -92,7 +92,7 @@ public class OperationTrait extends ExtendableObject { *

* MUST BE: *

*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index d6060da1..f1a1356e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -15,10 +15,10 @@ import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.ServerBinding; -import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer; -import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer; -import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer; -import com.asyncapi.v2.jackson.binding.server.ServerBindingsDeserializer; +import com.asyncapi.bindings.ChannelBindingsDeserializer; +import com.asyncapi.bindings.MessageBindingsDeserializer; +import com.asyncapi.bindings.OperationBindingsDeserializer; +import com.asyncapi.bindings.ServerBindingsDeserializer; import com.asyncapi.v2.security_scheme.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; @@ -52,7 +52,7 @@ public class Components extends ExtendableObject { * MUST BE: * */ @Nullable @@ -65,7 +65,7 @@ public class Components extends ExtendableObject { * MUST BE: * */ @Nullable @@ -78,7 +78,7 @@ public class Components extends ExtendableObject { * MUST BE: * */ @Nullable @@ -96,7 +96,7 @@ public class Components extends ExtendableObject { * MUST BE: * */ @Nullable @@ -109,7 +109,7 @@ public class Components extends ExtendableObject { * MUST BE: * */ @Nullable @@ -121,7 +121,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

*/ @@ -134,7 +134,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

*/ @@ -147,7 +147,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

*/ @@ -160,7 +160,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

*/ @@ -172,7 +172,7 @@ public class Components extends ExtendableObject { * An object to hold reusable {@link ServerBinding} Objects. * MUST BE: * */ @@ -184,7 +184,7 @@ public class Components extends ExtendableObject { * An object to hold reusable {@link ChannelBinding} Objects. * MUST BE: * */ @@ -196,7 +196,7 @@ public class Components extends ExtendableObject { * An object to hold reusable {@link OperationBinding} Objects. * MUST BE: * */ @@ -208,7 +208,7 @@ public class Components extends ExtendableObject { * An object to hold reusable {@link MessageBinding} Objects. * MUST BE: * */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java index 4d9f4c65..bb0256a4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java @@ -4,7 +4,7 @@ import com.asyncapi.v2._6_0.jackson.model.server.ServerVariablesDeserializer; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.bindings.ServerBinding; -import com.asyncapi.v2.jackson.binding.server.ServerBindingsDeserializer; +import com.asyncapi.bindings.ServerBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; @@ -73,7 +73,7 @@ public class Server extends ExtendableObject { *

* MUST be one of: *

*/ @@ -107,7 +107,7 @@ public class Server extends ExtendableObject { *

* MUST be one of: *

*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java deleted file mode 100644 index ab171d97..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/channel/ChannelBindingsDeserializer.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.asyncapi.v2.jackson.binding.channel; - -import com.asyncapi.v2.Reference; -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding; -import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding; -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; -import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; -import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; -import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; -import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; -import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; -import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; -import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; -import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; -import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; -import com.asyncapi.v2.jackson.BindingsMapDeserializer; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; - -/** - * Serializes channel bindings map. - * - * @author Pavel Bodiachevskii - */ -public class ChannelBindingsDeserializer extends BindingsMapDeserializer { - - public Object chooseKnownPojo(String bindingKey, JsonNode binding, ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = binding.traverse(objectCodec)) { - if (binding.get("$ref" ) != null) { - return jsonParser.readValueAs(Reference.class); - } - - switch (bindingKey) { - case "amqp": return jsonParser.readValueAs(AMQPChannelBinding.class); - case "amqp1": return jsonParser.readValueAs(AMQP1ChannelBinding.class); - case "anypointmq": return jsonParser.readValueAs(AnypointMQChannelBinding.class); - case "googlepubsub": return jsonParser.readValueAs(GooglePubSubChannelBinding.class); - case "http": return jsonParser.readValueAs(HTTPChannelBinding.class); - case "ibmmq": return jsonParser.readValueAs(IBMMQChannelBinding.class); - case "jms": return jsonParser.readValueAs(JMSChannelBinding.class); - case "kafka": return jsonParser.readValueAs(KafkaChannelBinding.class); - case "mercure": return jsonParser.readValueAs(MercureChannelBinding.class); - case "mqtt": return jsonParser.readValueAs(MQTTChannelBinding.class); - case "mqtt5": return jsonParser.readValueAs(MQTT5ChannelBinding.class); - case "nats": return jsonParser.readValueAs(NATSChannelBinding.class); - case "pulsar": return jsonParser.readValueAs(PulsarChannelBinding.class); - case "redis": return jsonParser.readValueAs(RedisChannelBinding.class); - case "sns": return jsonParser.readValueAs(SNSChannelBinding.class); - case "solace": return jsonParser.readValueAs(SolaceChannelBinding.class); - case "sqs": return jsonParser.readValueAs(SQSChannelBinding.class); - case "stomp": return jsonParser.readValueAs(STOMPChannelBinding.class); - case "ws": return jsonParser.readValueAs(WebSocketsChannelBinding.class); - default: return null; - } - } - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java deleted file mode 100644 index 82e10c25..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.asyncapi.v2.jackson.binding.message; - -import com.asyncapi.v2.Reference; -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding; -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding; -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; -import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; -import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; -import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; -import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; -import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; -import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; -import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; -import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; -import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; -import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; -import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; -import com.asyncapi.v2.jackson.BindingsMapDeserializer; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; - -/** - * Serializes message bindings map. - * - * @author Pavel Bodiachevskii - */ -public class MessageBindingsDeserializer extends BindingsMapDeserializer { - - public Object chooseKnownPojo(String bindingKey, JsonNode binding, ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = binding.traverse(objectCodec)) { - if (binding.get("$ref" ) != null) { - return jsonParser.readValueAs(Reference.class); - } - - switch (bindingKey) { - case "amqp": return jsonParser.readValueAs(AMQPMessageBinding.class); - case "amqp1": return jsonParser.readValueAs(AMQP1MessageBinding.class); - case "anypointmq": return jsonParser.readValueAs(AnypointMQMessageBinding.class); - case "googlepubsub": return jsonParser.readValueAs(GooglePubSubMessageBinding.class); - case "http": return jsonParser.readValueAs(HTTPMessageBinding.class); - case "ibmmq": return jsonParser.readValueAs(IBMMQMessageBinding.class); - case "jms": return jsonParser.readValueAs(JMSMessageBinding.class); - case "kafka": return jsonParser.readValueAs(KafkaMessageBinding.class); - case "mercure": return jsonParser.readValueAs(MercureMessageBinding.class); - case "mqtt": return jsonParser.readValueAs(MQTTMessageBinding.class); - case "mqtt5": return jsonParser.readValueAs(MQTT5MessageBinding.class); - case "nats": return jsonParser.readValueAs(NATSMessageBinding.class); - case "pulsar": return jsonParser.readValueAs(PulsarMessageBinding.class); - case "redis": return jsonParser.readValueAs(RedisMessageBinding.class); - case "sns": return jsonParser.readValueAs(SNSMessageBinding.class); - case "solace": return jsonParser.readValueAs(SolaceMessageBinding.class); - case "sqs": return jsonParser.readValueAs(SQSMessageBinding.class); - case "stomp": return jsonParser.readValueAs(STOMPMessageBinding.class); - case "ws": return jsonParser.readValueAs(WebSocketsMessageBinding.class); - default: return null; - } - } - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java deleted file mode 100644 index 7308f6c5..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.asyncapi.v2.jackson.binding.operation; - -import com.asyncapi.v2.Reference; -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; -import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; -import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding; -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding; -import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; -import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; -import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; -import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; -import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; -import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; -import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; -import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; -import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; -import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; -import com.asyncapi.v2.jackson.BindingsMapDeserializer; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; - -/** - * Serializes operation bindings map. - * - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -public class OperationBindingsDeserializer extends BindingsMapDeserializer { - - public Object chooseKnownPojo(String bindingKey, JsonNode binding, ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = binding.traverse(objectCodec)) { - if (binding.get("$ref" ) != null) { - return jsonParser.readValueAs(Reference.class); - } - - switch (bindingKey) { - case "amqp": return jsonParser.readValueAs(AMQPOperationBinding.class); - case "amqp1": return jsonParser.readValueAs(AMQP1OperationBinding.class); - case "anypointmq": return jsonParser.readValueAs(AnypointMQOperationBinding.class); - case "googlepubsub": return jsonParser.readValueAs(GooglePubSubOperationBinding.class); - case "http": return jsonParser.readValueAs(HTTPOperationBinding.class); - case "ibmmq": return jsonParser.readValueAs(IBMMQOperationBinding.class); - case "jms": return jsonParser.readValueAs(JMSOperationBinding.class); - case "kafka": return jsonParser.readValueAs(KafkaOperationBinding.class); - case "mercure": return jsonParser.readValueAs(MercureOperationBinding.class); - case "mqtt": return jsonParser.readValueAs(MQTTOperationBinding.class); - case "mqtt5": return jsonParser.readValueAs(MQTT5OperationBinding.class); - case "nats": return jsonParser.readValueAs(NATSOperationBinding.class); - case "pulsar": return jsonParser.readValueAs(PulsarOperationBinding.class); - case "redis": return jsonParser.readValueAs(RedisOperationBinding.class); - case "sns": return jsonParser.readValueAs(SNSOperationBinding.class); - case "solace": return jsonParser.readValueAs(SolaceOperationBinding.class); - case "sqs": return jsonParser.readValueAs(SQSOperationBinding.class); - case "stomp": return jsonParser.readValueAs(STOMPOperationBinding.class); - case "ws": return jsonParser.readValueAs(WebSocketsOperationBinding.class); - default: return null; - } - } - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java deleted file mode 100644 index ed36e933..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.asyncapi.v2.jackson.binding.server; - -import com.asyncapi.v2.Reference; -import com.asyncapi.bindings.amqp.v0._2_0.server.AMQPServerBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; -import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; -import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding; -import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; -import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; -import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; -import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; -import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; -import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; -import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; -import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; -import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; -import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; -import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; -import com.asyncapi.v2.jackson.BindingsMapDeserializer; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; - -/** - * Serializes server bindings map. - * - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -public class ServerBindingsDeserializer extends BindingsMapDeserializer { - - @Override - public Object chooseKnownPojo(String bindingKey, JsonNode binding, ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = binding.traverse(objectCodec)) { - if (binding.get("$ref" ) != null) { - return jsonParser.readValueAs(Reference.class); - } - - switch (bindingKey) { - case "amqp": return jsonParser.readValueAs(AMQPServerBinding.class); - case "amqp1": return jsonParser.readValueAs(AMQP1ServerBinding.class); - case "anypointmq": return jsonParser.readValueAs(AnypointMQServerBinding.class); - case "googlepubsub": return jsonParser.readValueAs(GooglePubSubServerBinding.class); - case "http": return jsonParser.readValueAs(HTTPServerBinding.class); - case "ibmmq": return jsonParser.readValueAs(IBMMQServerBinding.class); - case "jms": return jsonParser.readValueAs(JMSServerBinding.class); - case "kafka": return jsonParser.readValueAs(KafkaServerBinding.class); - case "mercure": return jsonParser.readValueAs(MercureServerBinding.class); - case "mqtt": return jsonParser.readValueAs(MQTTServerBinding.class); - case "mqtt5": return jsonParser.readValueAs(MQTT5ServerBinding.class); - case "nats": return jsonParser.readValueAs(NATSServerBinding.class); - case "pulsar": return jsonParser.readValueAs(PulsarServerBinding.class); - case "redis": return jsonParser.readValueAs(RedisServerBinding.class); - case "sns": return jsonParser.readValueAs(SNSServerBinding.class); - case "solace": return jsonParser.readValueAs(SolaceServerBinding.class); - case "sqs": return jsonParser.readValueAs(SQSServerBinding.class); - case "stomp": return jsonParser.readValueAs(STOMPServerBinding.class); - case "ws": return jsonParser.readValueAs(WebSocketsServerBinding.class); - default: return null; - } - } - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java index b09ac314..ca95dcd8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java index 71e39397..f8fc199d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java index 88e86b94..f5e180b7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Parameter; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java index c5cc3c01..820d3808 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Channel; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index 7c0988c2..987774b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.CorrelationId; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 34d85cdc..a6328ed9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java index 2de3a298..fca783fd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java index c5e5058a..bb8dcf5a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.MessageTrait; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java index 8438ddc2..ad1ac286 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.Message; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java index 3a233979..3ec96a39 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Channel; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java index 3ca82f14..9e651f65 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.CorrelationId; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java index 238f3197..cfb41d49 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java index 766c33c1..d77bb440 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.MessageTrait; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java index 26c6c2e6..5a54b6c1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.Message; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java index 23e65e59..a698e3bd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.OperationTrait; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java index d78264e2..9ccf9a80 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.Operation; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java index b35829d3..16141f99 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Parameter; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java index 97f5e213..d0212157 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java index 369f9154..1a99edb8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index 675174bc..d2bb9c59 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index 57f0dbbd..07cd67ce 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; import com.asyncapi.v3.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java index 2836d0df..8cd73e30 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.ServerVariable; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java index 64e77bfd..125ec1a8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.Server; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java index ef193b9f..09e8ed6f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java index ee7cf16b..288e8965 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.OperationTrait; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java index 12e3b8b8..979761f1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.Operation; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java index 08d220cc..841acfa8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation.reply; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java index b019f92e..3d1ee162 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation.reply; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java index 2f31028a..96272a67 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.server; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.ServerVariable; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java index 9639ed77..ab5d2287 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.server; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.Server; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java index cca08fc8..584bc17b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model; import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.channel.ChannelsDeserializer; import com.asyncapi.v3._0_0.jackson.model.operation.OperationsDeserializer; import com.asyncapi.v3._0_0.jackson.model.server.ServersDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java index a47a6007..565223cd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model; import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java index 993baec0..3114a787 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.channel; import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessagesDeserializer; @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3._0_0.model.channel.message.Message; import com.asyncapi.bindings.ChannelBinding; -import com.asyncapi.v3.jackson.binding.channel.ChannelBindingsDeserializer; +import com.asyncapi.bindings.ChannelBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java index a5bf1b0c..a690737c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.channel.message; import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.jackson.model.channel.message.MessagePayloadDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; -import com.asyncapi.v3.jackson.binding.message.MessageBindingsDeserializer; +import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; @@ -48,7 +48,7 @@ public class Message extends ExtendableObject { * */ @Nullable @@ -65,7 +65,7 @@ public class Message extends ExtendableObject { * */ @Nullable @@ -78,7 +78,7 @@ public class Message extends ExtendableObject { * MUST BE: * */ @JsonDeserialize(using = MessageCorrelationIdDeserializer.class) @@ -124,7 +124,7 @@ public class Message extends ExtendableObject { * MUST BE: * */ @Nullable @@ -144,7 +144,7 @@ public class Message extends ExtendableObject { * MUST BE: * * * @see Traits Merge Mechanism @@ -159,7 +159,7 @@ public class Message extends ExtendableObject { * MUST BE: * */ @Nullable diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java index b78249dc..3a4ecbce 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java @@ -1,14 +1,14 @@ package com.asyncapi.v3._0_0.model.channel.message; import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; -import com.asyncapi.v3.jackson.binding.message.MessageBindingsDeserializer; +import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; @@ -48,7 +48,7 @@ public class MessageTrait extends ExtendableObject { * */ @Nullable @@ -61,7 +61,7 @@ public class MessageTrait extends ExtendableObject { * MUST BE: * */ @JsonDeserialize(using = MessageCorrelationIdDeserializer.class) @@ -107,7 +107,7 @@ public class MessageTrait extends ExtendableObject { * MUST BE: * */ @Nullable @@ -126,7 +126,7 @@ public class MessageTrait extends ExtendableObject { * MUST BE: * */ @Nullable diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index efeec0ba..06c13cfe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.component; import com.asyncapi.v3._0_0.jackson.model.component.*; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3._0_0.model.channel.Channel; @@ -19,10 +19,10 @@ import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.ServerBinding; -import com.asyncapi.v3.jackson.binding.channel.ChannelBindingsDeserializer; -import com.asyncapi.v3.jackson.binding.message.MessageBindingsDeserializer; -import com.asyncapi.v3.jackson.binding.operation.OperationBindingsDeserializer; -import com.asyncapi.v3.jackson.binding.server.ServerBindingsDeserializer; +import com.asyncapi.bindings.ChannelBindingsDeserializer; +import com.asyncapi.bindings.MessageBindingsDeserializer; +import com.asyncapi.bindings.OperationBindingsDeserializer; +import com.asyncapi.bindings.ServerBindingsDeserializer; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.v3.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java index 71f547e0..18b6e5b9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java index 947573a0..0c3ef9b4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation; import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.operation.OperationTraitsDeserializer; @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v3.jackson.binding.operation.OperationBindingsDeserializer; +import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; import com.asyncapi.v3.security_scheme.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java index 05aafdaf..4b5c9aac 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java @@ -1,15 +1,13 @@ package com.asyncapi.v3._0_0.model.operation; import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; -import com.asyncapi.v3._0_0.jackson.model.operation.reply.OperationReplyDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; -import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; import com.asyncapi.bindings.OperationBinding; -import com.asyncapi.v3.jackson.binding.operation.OperationBindingsDeserializer; +import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; import com.asyncapi.v3.security_scheme.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java index 65e636a1..8c42cf55 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation.reply; import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.operation.reply.OperationReplyAddressDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java index af8b476d..96720c53 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java @@ -1,10 +1,10 @@ package com.asyncapi.v3._0_0.model.server; -import com.asyncapi.v3.jackson.binding.server.ServerBindingsDeserializer; +import com.asyncapi.bindings.ServerBindingsDeserializer; import com.asyncapi.v3._0_0.jackson.model.server.ServerVariablesDeserializer; import com.asyncapi.bindings.ServerBinding; import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/BindingsMapDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/BindingsMapDeserializer.java deleted file mode 100644 index d4e782c6..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/BindingsMapDeserializer.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.asyncapi.v3.jackson; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -/** - * Deserializes AsyncAPI bindings map. - */ -public abstract class BindingsMapDeserializer extends JsonDeserializer> { - - public abstract Object chooseKnownPojo(String bindingKey, JsonNode binding, ObjectCodec objectCodec) throws IOException; - - @Override - public Map deserialize( - JsonParser p, - DeserializationContext ctxt - ) throws IOException, JsonProcessingException { - ObjectCodec objectCodec = p.getCodec(); - JsonNode node = objectCodec.readTree(p); - - Map bindings = new HashMap<>(); - - node.fieldNames().forEachRemaining( - fieldName -> { - try { - bindings.put(fieldName, chooseKnownPojo(fieldName, node.get(fieldName), objectCodec)); - } catch (IOException e) { - e.printStackTrace(); - } - } - ); - - return bindings; - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java index 93a1429b..dfb85311 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.jackson.security_scheme; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; import com.asyncapi.v3.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java index 40e94f64..8f48e69b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.avro.v1._9_0.jackson; -import com.asyncapi.v3.Reference; +import com.asyncapi.Reference; import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchema; import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaUnion; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java index 8ef1618c..5841e172 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java @@ -1,5 +1,6 @@ package com.asyncapi.v3.schema.multiformat; +import com.asyncapi.Reference; import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.v3.schema.avro.v1._9_0.jackson.AvroSchemaDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; @@ -38,7 +39,7 @@ public AvroFormatSchema( *
    *
  • {@link com.asyncapi.v3.schema.avro.v1._9_0.AvroSchema}
    • *
  • {@link com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaUnion}
    • - *
  • {@link com.asyncapi.v3.Reference}
    • + *
  • {@link Reference}
    • *
* * @param schema Avro Schema or Reference @@ -53,7 +54,7 @@ public void setSchema(@NotNull Object schema) { *
    *
  • {@link com.asyncapi.v3.schema.avro.v1._9_0.AvroSchema}
    • *
  • {@link com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaUnion}
    • - *
  • {@link com.asyncapi.v3.Reference}
    • + *
  • {@link Reference}
    • *
*/ @NotNull diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java index b26840d7..dd5720ca 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java @@ -1,6 +1,7 @@ package com.asyncapi.v3.schema.multiformat; import com.asyncapi.ExtendableObject; +import com.asyncapi.Reference; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -124,7 +125,7 @@ public MultiFormatSchema( *

* In such a case, this would make the Multi Format Schema Object equivalent to the {@link AsyncAPISchema}. *

- * When using {@link com.asyncapi.v3.Reference} within the {@link #getSchema()}, the schemaFormat of the resource being referenced MUST match + * When using {@link Reference} within the {@link #getSchema()}, the schemaFormat of the resource being referenced MUST match * the schemaFormat of the {@link #getSchema()} that contains the initial reference. *

* For example, if you reference Avro schema, then schemaFormat of referencing resource and the resource being reference MUST match. @@ -135,7 +136,7 @@ public MultiFormatSchema( * A custom value MUST NOT refer to one of the schema formats listed in the table. *

*

- * When using {@link com.asyncapi.v3.Reference} within the {@link #getSchema()}, the schemaFormat of the referenced resource MUST + * When using {@link Reference} within the {@link #getSchema()}, the schemaFormat of the referenced resource MUST * match the schemaFormat of the schema containing the reference. * * @see Schema formats table diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt index 4abfebc1..7a12484d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt index 0655c2dc..4a6b03f7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.CorrelationId diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt index 34b04dde..b51ba526 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.CorrelationId diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt index 2d1023e4..36daaa59 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt index 20b03054..17ef936a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt index bc74b729..e50392e9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt index d37188e7..c93fe2dd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt index 8331e089..8a122739 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt index 26eb0567..d5345f33 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt index fa086a3e..80f868f7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt index 675a9b3e..5140ebeb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt index 7fa4c29d..877ce684 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt index 09ca44c4..4d00e127 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt index a1fbf8d7..2a88b81a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt index e134ce1f..399b6f34 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt index 84d93287..7909b9ed 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.CorrelationId diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt index d5e8c827..6799ec79 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.CorrelationId diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt index cced45cd..a57572af 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt index ffff0a14..73b37b6b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt index 3a108e11..443cfefb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt index 36d33248..dbc938d0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt index 60a32015..640d7fde 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt index c5254350..c1994011 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt index f1fc2791..b3fd1acc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt index 16a885f6..957a46c5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt index 0760fa81..88722c42 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt index c0324e8e..ea707b5b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt index 692f4168..11eaaa8f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt index a36f4b18..6f224c10 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -118,7 +118,9 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { ) .parameters(mapOf( Pair("env", Reference("#/components/parameters/Env")), - Pair("version", Reference("#/components/parameters/Version")) + Pair("version", + Reference("#/components/parameters/Version") + ) )) .bindings(mapOf( Pair("kafka", KafkaChannelBinding.builder() @@ -133,7 +135,9 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { ) )) .messages(mapOf( - Pair("CostingRequest", Reference("#/components/messages/costingRequestV1")) + Pair("CostingRequest", + Reference("#/components/messages/costingRequestV1") + ) )) .build() ), @@ -159,7 +163,9 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { )) .tags(listOf(Tag.builder().name("costing").build())) .messages(mapOf( - Pair("costingResponse", Reference("#/components/messages/costingResponse")) + Pair("costingResponse", + Reference("#/components/messages/costingResponse") + ) )) .build() ) @@ -253,7 +259,7 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { ) .payload(AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", - Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingRequestPayload.avsc") + Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingRequestPayload.avsc") )) .build() ), @@ -289,7 +295,7 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { ) .payload(AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", - Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingResponsePayload.avsc") + Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingResponsePayload.avsc") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt index e5c12705..39c0a3d8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components @@ -27,7 +27,9 @@ class AnyOfAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("test") .messages(mapOf( - Pair("testMessages", Reference("#/components/messages/testMessages")) + Pair("testMessages", + Reference("#/components/messages/testMessages") + ) )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt index 8c7e108d..067bc981 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId @@ -60,10 +60,14 @@ class ApplicationHeadersAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured") .messages(mapOf( - Pair("lightMeasured", Reference("#/components/messages/lightMeasured")) + Pair("lightMeasured", + Reference("#/components/messages/lightMeasured") + ) )) .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .build() ) @@ -78,7 +82,7 @@ class ApplicationHeadersAsyncAPI: AbstractExampleValidationTest() { .channel(Reference("#/channels/lightingMeasured")) .summary("Inform about environmental lighting conditions of a particular streetlight.") .messages(listOf( - Reference("#/channels/lightingMeasured/messages/lightMeasured") + Reference("#/channels/lightingMeasured/messages/lightMeasured") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt index 9a1a2f0c..f8792f7f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt @@ -1,7 +1,7 @@ package com.asyncapi.examples.v3._0_0 import com.asyncapi.v3.security_scheme.ApiKeySecurityScheme -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId @@ -56,7 +56,7 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { ) )) .security(listOf( - Reference("#/components/securitySchemes/apiKey"), + Reference("#/components/securitySchemes/apiKey"), OAuth2SecurityScheme( "Flows to support OAuth 2.0", OAuthFlows( @@ -104,7 +104,7 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { "streetlights:dim", ), ), - Reference("#/components/securitySchemes/openIdConnectWellKnown"), + Reference("#/components/securitySchemes/openIdConnectWellKnown"), )) .build() ) @@ -117,10 +117,14 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured") .messages(mapOf( - Pair("lightMeasured", Reference("#/components/messages/lightMeasured")) + Pair("lightMeasured", + Reference("#/components/messages/lightMeasured") + ) )) .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .build() ), @@ -128,10 +132,14 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting/streetlights/1/0/action/{streetlightId}/dim") .messages(mapOf( - Pair("dimLight", Reference("#/components/messages/dimLight")) + Pair("dimLight", + Reference("#/components/messages/dimLight") + ) )) .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .build() ) @@ -146,7 +154,7 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { .channel(Reference("#/channels/lightingMeasured")) .summary("Inform about environmental lighting conditions of a particular streetlight.") .messages(listOf( - Reference("#/channels/lightingMeasured/messages/lightMeasured") + Reference("#/channels/lightingMeasured/messages/lightMeasured") )) .build() ), @@ -155,7 +163,7 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.SEND) .channel(Reference("#/channels/lightsDim")) .messages(listOf( - Reference("#/channels/lightsDim/messages/dimLight") + Reference("#/channels/lightsDim/messages/dimLight") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index 6f42115a..7ad9abcb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -1,7 +1,7 @@ package com.asyncapi.examples.v3._0_0 import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.Message @@ -39,7 +39,7 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { .protocol("https") .protocolVersion("1.1") .security(listOf( - Reference("#/components/securitySchemes/httpBearerToken") + Reference("#/components/securitySchemes/httpBearerToken") )) .build() ) @@ -52,8 +52,12 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("/rooms/{roomId}/{resource}") .messages(mapOf( - Pair("chatMessage", Reference("#/components/messages/chatMessage")), - Pair("heartbeat", Reference("#/components/messages/heartbeat")) + Pair("chatMessage", + Reference("#/components/messages/chatMessage") + ), + Pair("heartbeat", + Reference("#/components/messages/heartbeat") + ) )) .parameters(mapOf( Pair("roomId", Parameter.builder() @@ -83,8 +87,8 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { ) )) .messages(listOf( - Reference("#/channels/rooms/messages/chatMessage"), - Reference("#/channels/rooms/messages/heartbeat") + Reference("#/channels/rooms/messages/chatMessage"), + Reference("#/channels/rooms/messages/heartbeat") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt index 073c1760..52fafacf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.CorrelationId import com.asyncapi.v3._0_0.model.channel.message.Message @@ -45,14 +45,30 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa Channel.builder() .address("/") .messages(mapOf( - Pair("ping", Reference("#/components/messages/ping")), - Pair("pong", Reference("#/components/messages/pong")), - Pair("heartbeat", Reference("#/components/messages/heartbeat")), - Pair("systemStatus", Reference("#/components/messages/systemStatus")), - Pair("subscriptionStatus", Reference("#/components/messages/subscriptionStatus")), - Pair("subscribe", Reference("#/components/messages/subscribe")), - Pair("unsubscribe", Reference("#/components/messages/unsubscribe")), - Pair("dummyCurrencyInfo", Reference("#/components/messages/dummyCurrencyInfo")), + Pair("ping", + Reference("#/components/messages/ping") + ), + Pair("pong", + Reference("#/components/messages/pong") + ), + Pair("heartbeat", + Reference("#/components/messages/heartbeat") + ), + Pair("systemStatus", + Reference("#/components/messages/systemStatus") + ), + Pair("subscriptionStatus", + Reference("#/components/messages/subscriptionStatus") + ), + Pair("subscribe", + Reference("#/components/messages/subscribe") + ), + Pair("unsubscribe", + Reference("#/components/messages/unsubscribe") + ), + Pair("dummyCurrencyInfo", + Reference("#/components/messages/dummyCurrencyInfo") + ), )) .build() ) @@ -66,7 +82,7 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa .channel(Reference("#/channels/currencyExchange")) .reply(OperationReply( null, - Reference("#/channels/currencyExchange"), + Reference("#/channels/currencyExchange"), listOf(Reference("#/channels/currencyExchange/messages/pong")) )) .messages(listOf(Reference("#/channels/currencyExchange/messages/ping"))) @@ -89,10 +105,10 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa .channel(Reference("#/channels/currencyExchange")) .reply(OperationReply( null, - Reference("#/channels/currencyExchange"), + Reference("#/channels/currencyExchange"), listOf( - Reference("#/channels/currencyExchange/messages/subscriptionStatus"), - Reference("#/channels/currencyExchange/messages/dummyCurrencyInfo") + Reference("#/channels/currencyExchange/messages/subscriptionStatus"), + Reference("#/channels/currencyExchange/messages/dummyCurrencyInfo") ) )) .messages(listOf(Reference("#/channels/currencyExchange/messages/subscribe"))) @@ -103,9 +119,9 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa .channel(Reference("#/channels/currencyExchange")) .reply(OperationReply( null, - Reference("#/channels/currencyExchange"), + Reference("#/channels/currencyExchange"), listOf( - Reference("#/channels/currencyExchange/messages/subscriptionStatus") + Reference("#/channels/currencyExchange/messages/subscriptionStatus") ) )) .messages(listOf(Reference("#/channels/currencyExchange/messages/unsubscribe"))) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt index 54d41f9d..42062c6c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.CorrelationId import com.asyncapi.v3._0_0.model.channel.message.Message @@ -45,7 +45,9 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida Channel.builder() .address("/") .messages(mapOf( - Pair("ping", Reference("#/components/messages/ping")), + Pair("ping", + Reference("#/components/messages/ping") + ), )) .build() ), @@ -53,7 +55,9 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida Channel.builder() .address("/") .messages(mapOf( - Pair("pong", Reference("#/components/messages/pong")), + Pair("pong", + Reference("#/components/messages/pong") + ), )) .build() ), @@ -61,7 +65,9 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida Channel.builder() .address("/") .messages(mapOf( - Pair("heartbeat", Reference("#/components/messages/heartbeat")), + Pair("heartbeat", + Reference("#/components/messages/heartbeat") + ), )) .build() ), @@ -69,7 +75,9 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida Channel.builder() .address("/") .messages(mapOf( - Pair("systemStatus", Reference("#/components/messages/systemStatus")), + Pair("systemStatus", + Reference("#/components/messages/systemStatus") + ), )) .build() ), @@ -77,8 +85,12 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida Channel.builder() .address("/") .messages(mapOf( - Pair("subscriptionStatus", Reference("#/components/messages/subscriptionStatus")), - Pair("dummyCurrencyInfo", Reference("#/components/messages/dummyCurrencyInfo")), + Pair("subscriptionStatus", + Reference("#/components/messages/subscriptionStatus") + ), + Pair("dummyCurrencyInfo", + Reference("#/components/messages/dummyCurrencyInfo") + ), )) .build() ), @@ -86,7 +98,9 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida Channel.builder() .address("/") .messages(mapOf( - Pair("subscribe", Reference("#/components/messages/subscribe")), + Pair("subscribe", + Reference("#/components/messages/subscribe") + ), )) .build() ), @@ -94,7 +108,9 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida Channel.builder() .address("/") .messages(mapOf( - Pair("unsubscribe", Reference("#/components/messages/unsubscribe")), + Pair("unsubscribe", + Reference("#/components/messages/unsubscribe") + ), )) .build() ) @@ -108,7 +124,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .channel(Reference("#/channels/ping")) .reply(OperationReply( null, - Reference("#/channels/pong"), + Reference("#/channels/pong"), null )) .build() @@ -128,7 +144,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .channel(Reference("#/channels/subscribe")) .reply(OperationReply( null, - Reference("#/channels/currencyInfo"), + Reference("#/channels/currencyInfo"), null )) .build() @@ -138,7 +154,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .channel(Reference("#/channels/unsubscribe")) .reply(OperationReply( null, - Reference("#/channels/currencyInfo"), + Reference("#/channels/currencyInfo"), listOf(Reference("#/channels/currencyInfo/messages/subscriptionStatus")) )) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt index 2a33eb60..90c64606 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -44,7 +44,9 @@ class MercureAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("https://example.com/books/{id}") .messages(mapOf( - Pair("book", Reference("#/components/messages/book")) + Pair("book", + Reference("#/components/messages/book") + ) )) .description( "Every time a resource of type `http://schema.org/Book` is created or " + @@ -66,7 +68,7 @@ class MercureAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.RECEIVE) .channel(Reference("#/channels/books")) .messages(listOf( - Reference("#/channels/books/messages/book") + Reference("#/channels/books/messages/book") )) .build() ), @@ -75,7 +77,7 @@ class MercureAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.SEND) .channel(Reference("#/channels/books")) .messages(listOf( - Reference("#/channels/books/messages/book") + Reference("#/channels/books/messages/book") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt index fae868ca..661e93a4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components @@ -28,7 +28,9 @@ class NotAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("test") .messages(mapOf( - Pair("testMessages", Reference("#/components/messages/testMessages")) + Pair("testMessages", + Reference("#/components/messages/testMessages") + ) )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt index ee97d3f5..9161ff86 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components @@ -28,7 +28,9 @@ class OneOfAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("test") .messages(mapOf( - Pair("testMessages", Reference("#/components/messages/testMessages")) + Pair("testMessages", + Reference("#/components/messages/testMessages") + ) )) .build() ), @@ -36,8 +38,16 @@ class OneOfAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("test2") .messages(mapOf( - Pair("objectWithKey", Message.builder().payload(Reference("#/components/schemas/objectWithKey")).build()), - Pair("objectWithKey2", Message.builder().payload(Reference("#/components/schemas/objectWithKey2")).build()) + Pair("objectWithKey", Message.builder().payload( + Reference( + "#/components/schemas/objectWithKey" + ) + ).build()), + Pair("objectWithKey2", Message.builder().payload( + Reference( + "#/components/schemas/objectWithKey2" + ) + ).build()) )) .build() ) @@ -58,8 +68,8 @@ class OneOfAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.SEND) .channel(Reference("#/channels/test2")) .messages(listOf( - Reference("#/channels/test2/messages/objectWithKey"), - Reference("#/channels/test2/messages/objectWithKey2") + Reference("#/channels/test2/messages/objectWithKey"), + Reference("#/channels/test2/messages/objectWithKey2") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt index eb7fda1c..dfc37776 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components @@ -34,7 +34,9 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("AUTHORIZATION_REVOCATION") .messages(mapOf( - Pair("message", Reference("#/components/messages/message")) + Pair("message", + Reference("#/components/messages/message") + ) )) .build() ) @@ -71,7 +73,7 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { .build()) )) .messages(listOf( - Reference("#/channels/authRevoke/messages/message") + Reference("#/channels/authRevoke/messages/message") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt index 10190f74..56e2cd70 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId @@ -136,7 +136,7 @@ class RpcClientAsyncAPI: AbstractExampleValidationTest() { ) )) .messages(listOf( - Reference("#/channels/queue/messages/receiveSumResult") + Reference("#/channels/queue/messages/receiveSumResult") )) .build() ), @@ -152,7 +152,7 @@ class RpcClientAsyncAPI: AbstractExampleValidationTest() { ) )) .messages(listOf( - Reference("#/channels/rpc_queue/messages/requestSum") + Reference("#/channels/rpc_queue/messages/requestSum") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt index 79d92ff1..c84361a5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId @@ -136,7 +136,7 @@ class RpcServerAsyncAPI: AbstractExampleValidationTest() { ) )) .messages(listOf( - Reference("#/channels/queue/messages/sendSumResult") + Reference("#/channels/queue/messages/sendSumResult") )) .build() ), @@ -145,7 +145,7 @@ class RpcServerAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.RECEIVE) .channel(Reference("#/channels/rpc_queue")) .messages(listOf( - Reference("#/channels/rpc_queue/messages/sum") + Reference("#/channels/rpc_queue/messages/sum") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt index b0ac9077..d1539244 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components @@ -29,7 +29,9 @@ class SimpleAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("user/signedup") .messages(mapOf( - Pair("UserSignedUp", Reference("#/components/messages/UserSignedUp")) + Pair("UserSignedUp", + Reference("#/components/messages/UserSignedUp") + ) )) .build() ) @@ -43,7 +45,7 @@ class SimpleAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.SEND) .channel(Reference("#/channels/userSignedup")) .messages(listOf( - Reference("#/channels/userSignedup/messages/UserSignedUp") + Reference("#/channels/userSignedup/messages/UserSignedUp") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt index 4bee7d0c..f56b5f34 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components @@ -33,7 +33,7 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { .protocol("https") .protocolVersion("1.1") .security(listOf( - Reference("#/components/securitySchemes/token") + Reference("#/components/securitySchemes/token") )) .build() ) @@ -46,53 +46,147 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("/") .messages(mapOf( - Pair("outgoingMessage", Reference("#/components/messages/outgoingMessage")), - Pair("hello", Reference("#/components/messages/hello")), - Pair("connectionError", Reference("#/components/messages/connectionError")), - Pair("accountsChanged", Reference("#/components/messages/accountsChanged")), - Pair("botAdded", Reference("#/components/messages/botAdded")), - Pair("botChanged", Reference("#/components/messages/botChanged")), - Pair("channelArchive", Reference("#/components/messages/channelArchive")), - Pair("channelCreated", Reference("#/components/messages/channelCreated")), - Pair("channelDeleted", Reference("#/components/messages/channelDeleted")), - Pair("channelHistoryChanged", Reference("#/components/messages/channelHistoryChanged")), - Pair("channelJoined", Reference("#/components/messages/channelJoined")), - Pair("channelLeft", Reference("#/components/messages/channelLeft")), - Pair("channelMarked", Reference("#/components/messages/channelMarked")), - Pair("channelRename", Reference("#/components/messages/channelRename")), - Pair("channelUnarchive", Reference("#/components/messages/channelUnarchive")), - Pair("commandsChanged", Reference("#/components/messages/commandsChanged")), - Pair("dndUpdated", Reference("#/components/messages/dndUpdated")), - Pair("dndUpdatedUser", Reference("#/components/messages/dndUpdatedUser")), - Pair("emailDomainChanged", Reference("#/components/messages/emailDomainChanged")), - Pair("emojiRemoved", Reference("#/components/messages/emojiRemoved")), - Pair("emojiAdded", Reference("#/components/messages/emojiAdded")), - Pair("fileChange", Reference("#/components/messages/fileChange")), - Pair("fileCommentAdded", Reference("#/components/messages/fileCommentAdded")), - Pair("fileCommentDeleted", Reference("#/components/messages/fileCommentDeleted")), - Pair("fileCommentEdited", Reference("#/components/messages/fileCommentEdited")), - Pair("fileCreated", Reference("#/components/messages/fileCreated")), - Pair("fileDeleted", Reference("#/components/messages/fileDeleted")), - Pair("filePublic", Reference("#/components/messages/filePublic")), - Pair("fileShared", Reference("#/components/messages/fileShared")), - Pair("fileUnshared", Reference("#/components/messages/fileUnshared")), - Pair("goodbye", Reference("#/components/messages/goodbye")), - Pair("groupArchive", Reference("#/components/messages/groupArchive")), - Pair("groupClose", Reference("#/components/messages/groupClose")), - Pair("groupHistoryChanged", Reference("#/components/messages/groupHistoryChanged")), - Pair("groupJoined", Reference("#/components/messages/groupJoined")), - Pair("groupLeft", Reference("#/components/messages/groupLeft")), - Pair("groupMarked", Reference("#/components/messages/groupMarked")), - Pair("groupOpen", Reference("#/components/messages/groupOpen")), - Pair("groupRename", Reference("#/components/messages/groupRename")), - Pair("groupUnarchive", Reference("#/components/messages/groupUnarchive")), - Pair("imClose", Reference("#/components/messages/imClose")), - Pair("imCreated", Reference("#/components/messages/imCreated")), - Pair("imMarked", Reference("#/components/messages/imMarked")), - Pair("imOpen", Reference("#/components/messages/imOpen")), - Pair("manualPresenceChange", Reference("#/components/messages/manualPresenceChange")), - Pair("memberJoinedChannel", Reference("#/components/messages/memberJoinedChannel")), - Pair("message", Reference("#/components/messages/message")), + Pair("outgoingMessage", + Reference("#/components/messages/outgoingMessage") + ), + Pair("hello", + Reference("#/components/messages/hello") + ), + Pair("connectionError", + Reference("#/components/messages/connectionError") + ), + Pair("accountsChanged", + Reference("#/components/messages/accountsChanged") + ), + Pair("botAdded", + Reference("#/components/messages/botAdded") + ), + Pair("botChanged", + Reference("#/components/messages/botChanged") + ), + Pair("channelArchive", + Reference("#/components/messages/channelArchive") + ), + Pair("channelCreated", + Reference("#/components/messages/channelCreated") + ), + Pair("channelDeleted", + Reference("#/components/messages/channelDeleted") + ), + Pair("channelHistoryChanged", + Reference("#/components/messages/channelHistoryChanged") + ), + Pair("channelJoined", + Reference("#/components/messages/channelJoined") + ), + Pair("channelLeft", + Reference("#/components/messages/channelLeft") + ), + Pair("channelMarked", + Reference("#/components/messages/channelMarked") + ), + Pair("channelRename", + Reference("#/components/messages/channelRename") + ), + Pair("channelUnarchive", + Reference("#/components/messages/channelUnarchive") + ), + Pair("commandsChanged", + Reference("#/components/messages/commandsChanged") + ), + Pair("dndUpdated", + Reference("#/components/messages/dndUpdated") + ), + Pair("dndUpdatedUser", + Reference("#/components/messages/dndUpdatedUser") + ), + Pair("emailDomainChanged", + Reference("#/components/messages/emailDomainChanged") + ), + Pair("emojiRemoved", + Reference("#/components/messages/emojiRemoved") + ), + Pair("emojiAdded", + Reference("#/components/messages/emojiAdded") + ), + Pair("fileChange", + Reference("#/components/messages/fileChange") + ), + Pair("fileCommentAdded", + Reference("#/components/messages/fileCommentAdded") + ), + Pair("fileCommentDeleted", + Reference("#/components/messages/fileCommentDeleted") + ), + Pair("fileCommentEdited", + Reference("#/components/messages/fileCommentEdited") + ), + Pair("fileCreated", + Reference("#/components/messages/fileCreated") + ), + Pair("fileDeleted", + Reference("#/components/messages/fileDeleted") + ), + Pair("filePublic", + Reference("#/components/messages/filePublic") + ), + Pair("fileShared", + Reference("#/components/messages/fileShared") + ), + Pair("fileUnshared", + Reference("#/components/messages/fileUnshared") + ), + Pair("goodbye", + Reference("#/components/messages/goodbye") + ), + Pair("groupArchive", + Reference("#/components/messages/groupArchive") + ), + Pair("groupClose", + Reference("#/components/messages/groupClose") + ), + Pair("groupHistoryChanged", + Reference("#/components/messages/groupHistoryChanged") + ), + Pair("groupJoined", + Reference("#/components/messages/groupJoined") + ), + Pair("groupLeft", + Reference("#/components/messages/groupLeft") + ), + Pair("groupMarked", + Reference("#/components/messages/groupMarked") + ), + Pair("groupOpen", + Reference("#/components/messages/groupOpen") + ), + Pair("groupRename", + Reference("#/components/messages/groupRename") + ), + Pair("groupUnarchive", + Reference("#/components/messages/groupUnarchive") + ), + Pair("imClose", + Reference("#/components/messages/imClose") + ), + Pair("imCreated", + Reference("#/components/messages/imCreated") + ), + Pair("imMarked", + Reference("#/components/messages/imMarked") + ), + Pair("imOpen", + Reference("#/components/messages/imOpen") + ), + Pair("manualPresenceChange", + Reference("#/components/messages/manualPresenceChange") + ), + Pair("memberJoinedChannel", + Reference("#/components/messages/memberJoinedChannel") + ), + Pair("message", + Reference("#/components/messages/message") + ), )) .build() ) @@ -106,7 +200,7 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.RECEIVE) .channel(Reference("#/channels/root")) .messages(listOf( - Reference("#/channels/root/messages/outgoingMessage") + Reference("#/channels/root/messages/outgoingMessage") )) .build() ), @@ -115,52 +209,52 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.SEND) .channel(Reference("#/channels/root")) .messages(listOf( - Reference("#/channels/root/messages/hello"), - Reference("#/channels/root/messages/connectionError"), - Reference("#/channels/root/messages/accountsChanged"), - Reference("#/channels/root/messages/botAdded"), - Reference("#/channels/root/messages/botChanged"), - Reference("#/channels/root/messages/channelArchive"), - Reference("#/channels/root/messages/channelCreated"), - Reference("#/channels/root/messages/channelDeleted"), - Reference("#/channels/root/messages/channelHistoryChanged"), - Reference("#/channels/root/messages/channelJoined"), - Reference("#/channels/root/messages/channelLeft"), - Reference("#/channels/root/messages/channelMarked"), - Reference("#/channels/root/messages/channelRename"), - Reference("#/channels/root/messages/channelUnarchive"), - Reference("#/channels/root/messages/commandsChanged"), - Reference("#/channels/root/messages/dndUpdated"), - Reference("#/channels/root/messages/dndUpdatedUser"), - Reference("#/channels/root/messages/emailDomainChanged"), - Reference("#/channels/root/messages/emojiRemoved"), - Reference("#/channels/root/messages/emojiAdded"), - Reference("#/channels/root/messages/fileChange"), - Reference("#/channels/root/messages/fileCommentAdded"), - Reference("#/channels/root/messages/fileCommentDeleted"), - Reference("#/channels/root/messages/fileCommentEdited"), - Reference("#/channels/root/messages/fileCreated"), - Reference("#/channels/root/messages/fileDeleted"), - Reference("#/channels/root/messages/filePublic"), - Reference("#/channels/root/messages/fileShared"), - Reference("#/channels/root/messages/fileUnshared"), - Reference("#/channels/root/messages/goodbye"), - Reference("#/channels/root/messages/groupArchive"), - Reference("#/channels/root/messages/groupClose"), - Reference("#/channels/root/messages/groupHistoryChanged"), - Reference("#/channels/root/messages/groupJoined"), - Reference("#/channels/root/messages/groupLeft"), - Reference("#/channels/root/messages/groupMarked"), - Reference("#/channels/root/messages/groupOpen"), - Reference("#/channels/root/messages/groupRename"), - Reference("#/channels/root/messages/groupUnarchive"), - Reference("#/channels/root/messages/imClose"), - Reference("#/channels/root/messages/imCreated"), - Reference("#/channels/root/messages/imMarked"), - Reference("#/channels/root/messages/imOpen"), - Reference("#/channels/root/messages/manualPresenceChange"), - Reference("#/channels/root/messages/memberJoinedChannel"), - Reference("#/channels/root/messages/message"), + Reference("#/channels/root/messages/hello"), + Reference("#/channels/root/messages/connectionError"), + Reference("#/channels/root/messages/accountsChanged"), + Reference("#/channels/root/messages/botAdded"), + Reference("#/channels/root/messages/botChanged"), + Reference("#/channels/root/messages/channelArchive"), + Reference("#/channels/root/messages/channelCreated"), + Reference("#/channels/root/messages/channelDeleted"), + Reference("#/channels/root/messages/channelHistoryChanged"), + Reference("#/channels/root/messages/channelJoined"), + Reference("#/channels/root/messages/channelLeft"), + Reference("#/channels/root/messages/channelMarked"), + Reference("#/channels/root/messages/channelRename"), + Reference("#/channels/root/messages/channelUnarchive"), + Reference("#/channels/root/messages/commandsChanged"), + Reference("#/channels/root/messages/dndUpdated"), + Reference("#/channels/root/messages/dndUpdatedUser"), + Reference("#/channels/root/messages/emailDomainChanged"), + Reference("#/channels/root/messages/emojiRemoved"), + Reference("#/channels/root/messages/emojiAdded"), + Reference("#/channels/root/messages/fileChange"), + Reference("#/channels/root/messages/fileCommentAdded"), + Reference("#/channels/root/messages/fileCommentDeleted"), + Reference("#/channels/root/messages/fileCommentEdited"), + Reference("#/channels/root/messages/fileCreated"), + Reference("#/channels/root/messages/fileDeleted"), + Reference("#/channels/root/messages/filePublic"), + Reference("#/channels/root/messages/fileShared"), + Reference("#/channels/root/messages/fileUnshared"), + Reference("#/channels/root/messages/goodbye"), + Reference("#/channels/root/messages/groupArchive"), + Reference("#/channels/root/messages/groupClose"), + Reference("#/channels/root/messages/groupHistoryChanged"), + Reference("#/channels/root/messages/groupJoined"), + Reference("#/channels/root/messages/groupLeft"), + Reference("#/channels/root/messages/groupMarked"), + Reference("#/channels/root/messages/groupOpen"), + Reference("#/channels/root/messages/groupRename"), + Reference("#/channels/root/messages/groupUnarchive"), + Reference("#/channels/root/messages/imClose"), + Reference("#/channels/root/messages/imCreated"), + Reference("#/channels/root/messages/imMarked"), + Reference("#/channels/root/messages/imOpen"), + Reference("#/channels/root/messages/manualPresenceChange"), + Reference("#/channels/root/messages/memberJoinedChannel"), + Reference("#/channels/root/messages/message"), )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt index f18e4bce..ca09113f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -69,7 +69,7 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { .protocol("kafka-secure") .description("Test broker secured with X509") .security(listOf( - Reference("#/components/securitySchemes/certs") + Reference("#/components/securitySchemes/certs") )) .tags(listOf( Tag.builder() @@ -95,30 +95,46 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { Pair("lightingMeasured", Channel.builder() .address("smartylighting.streetlights.1.0.event.{streetlightId}.lighting.measured") - .messages(mapOf(Pair("lightMeasured", Reference("#/components/messages/lightMeasured")))) + .messages(mapOf(Pair("lightMeasured", + Reference("#/components/messages/lightMeasured") + ))) .description("The topic on which measured values may be produced and consumed.") - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .build() ), Pair("lightTurnOn", Channel.builder() .address("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on") - .messages(mapOf(Pair("turnOn", Reference("#/components/messages/turnOnOff")))) - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .messages(mapOf(Pair("turnOn", + Reference("#/components/messages/turnOnOff") + ))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .build() ), Pair("lightTurnOff", Channel.builder() .address("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off") - .messages(mapOf(Pair("turnOff", Reference("#/components/messages/turnOnOff")))) - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .messages(mapOf(Pair("turnOff", + Reference("#/components/messages/turnOnOff") + ))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .build() ), Pair("lightsDim", Channel.builder() .address("smartylighting.streetlights.1.0.action.{streetlightId}.dim") - .messages(mapOf(Pair("dimLight", Reference("#/components/messages/dimLight")))) - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .messages(mapOf(Pair("dimLight", + Reference("#/components/messages/dimLight") + ))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .build() ) ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index 06bf335b..455ee4f1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -2,7 +2,7 @@ package com.asyncapi.examples.v3._0_0 import com.asyncapi.v3.security_scheme.ApiKeySecurityScheme import com.asyncapi.v3.security_scheme.OpenIdConnectSecurityScheme -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -66,7 +66,7 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { ) )) .security(listOf( - Reference("#/components/securitySchemes/apiKey"), + Reference("#/components/securitySchemes/apiKey"), OAuth2SecurityScheme( "Flows to support OAuth 2.0", OAuthFlows( @@ -110,7 +110,7 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { ), listOf("streetlights:on", "streetlights:off", "streetlights:dim") ), - Reference("#/components/securitySchemes/openIdConnectWellKnown") + Reference("#/components/securitySchemes/openIdConnectWellKnown") )) .tags(listOf( Tag("env:production", "This environment is meant for production use case", null), @@ -128,11 +128,15 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured") .messages(mapOf( - Pair("lightMeasured", Reference("#/components/messages/lightMeasured")) + Pair("lightMeasured", + Reference("#/components/messages/lightMeasured") + ) )) .description("The topic on which measured values may be produced and consumed.") .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .build() ), @@ -140,10 +144,14 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting/streetlights/1/0/action/{streetlightId}/turn/on") .messages(mapOf( - Pair("turnOn", Reference("#/components/messages/turnOnOff")) + Pair("turnOn", + Reference("#/components/messages/turnOnOff") + ) )) .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .build() ), @@ -151,10 +159,14 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting/streetlights/1/0/action/{streetlightId}/turn/off") .messages(mapOf( - Pair("turnOff", Reference("#/components/messages/turnOnOff")) + Pair("turnOff", + Reference("#/components/messages/turnOnOff") + ) )) .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .build() ), @@ -162,10 +174,14 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting/streetlights/1/0/action/{streetlightId}/dim") .messages(mapOf( - Pair("dimLight", Reference("#/components/messages/dimLight")) + Pair("dimLight", + Reference("#/components/messages/dimLight") + ) )) .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt index 2a470789..9cda4029 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.Message @@ -85,34 +85,50 @@ class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { Pair("lightingMeasured", Channel.builder() .address("smartylighting.streetlights.1.0.event.{streetlightId}.lighting.measured") - .messages(mapOf(Pair("lightMeasured", Reference("#/components/messages/lightMeasured")))) + .messages(mapOf(Pair("lightMeasured", + Reference("#/components/messages/lightMeasured") + ))) .description("The topic on which measured values may be produced and consumed.") .servers(listOf(Reference("#/servers/test"))) - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .build() ), Pair("lightTurnOn", Channel.builder() .address("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on") - .messages(mapOf(Pair("turnOn", Reference("#/components/messages/turnOnOff")))) + .messages(mapOf(Pair("turnOn", + Reference("#/components/messages/turnOnOff") + ))) .servers(listOf(Reference("#/servers/test_oauth"))) - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .build() ), Pair("lightTurnOff", Channel.builder() .address("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off") - .messages(mapOf(Pair("turnOff", Reference("#/components/messages/turnOnOff")))) + .messages(mapOf(Pair("turnOff", + Reference("#/components/messages/turnOnOff") + ))) .servers(listOf(Reference("#/servers/test_oauth"))) - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .build() ), Pair("lightsDim", Channel.builder() .address("smartylighting.streetlights.1.0.action.{streetlightId}.dim") - .messages(mapOf(Pair("dimLight", Reference("#/components/messages/dimLight")))) + .messages(mapOf(Pair("dimLight", + Reference("#/components/messages/dimLight") + ))) .servers(listOf(Reference("#/servers/test_oauth"))) - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .build() ) ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt index 5a2a5a03..564326c5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -14,8 +14,6 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding import com.asyncapi.v3.schema.AsyncAPISchema -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test class WebsocketGeminiAsyncAPI: AbstractExampleValidationTest() { @@ -53,7 +51,9 @@ class WebsocketGeminiAsyncAPI: AbstractExampleValidationTest() { .address("/v1/marketdata/{symbol}") .messages( mapOf( - Pair("marketData", Reference("#/components/messages/marketData")) + Pair("marketData", + Reference("#/components/messages/marketData") + ) ) ) .parameters( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt index e5075e24..05432b01 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 2e20ecb1..721c06d6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v2._0_0.model.channel.message import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.MessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 5965b602..74c1ef5c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v2._0_0.model.channel.operation import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.message.MessageTest import com.asyncapi.bindings.OperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt index 630ef078..e16b65b7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model.component import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItemTest import com.asyncapi.v2._0_0.model.channel.ParameterTest import com.asyncapi.v2._0_0.model.channel.message.CorrelationIdTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt index 57300656..0e5368be 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.channel.ChannelItemTest import com.asyncapi.v2._6_0.model.component.ComponentsTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt index aa1199db..2ad7f68d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 887452a9..7a2425c8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt index 2997d669..3cf2e882 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2.schema.Schema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index 61cb7557..97d45408 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 2b5dce28..88c1941c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt index 40a4f6a6..408f50ea 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.message import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 1b9ecb4f..a74c67c8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.operation -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 5323cc73..a958a739 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.operation -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt index 2135c2f3..f2b69d0c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.component -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.schema.Type diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index 1bac6bc8..c4724f26 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.server -import com.asyncapi.v2.Reference +import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt index 080fbb0d..e9ee8bcf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.channel.ChannelTest import com.asyncapi.v3._0_0.model.channel.ChannelTestWithReference @@ -43,7 +43,9 @@ class AsyncAPITest: SerDeTest() { mapOf( Pair("operation 1", OperationTest().build()), Pair("operation 2", OperationTestWithReference().build()), - Pair("operation 3", Reference("#/components/operations/operation")) + Pair("operation 3", + Reference("#/components/operations/operation") + ) ), ComponentsTest().build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt index 9ebf9892..ea0d0a19 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt index e18a3ca9..d35102e9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest /** @@ -20,7 +20,7 @@ class TagTestWithReferenceToExternalDocs: SerDeTest() { return Tag( "user", "User-related messages", - Reference("#/components/external-doc") + Reference("#/components/external-doc") ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index e48f456b..c05ccdbd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.TagTest @@ -33,16 +33,20 @@ class ChannelTest: SerDeTest() { .summary("messages about user events.") .description("This channel is used to exchange messages about users signing up") .servers(listOf( - Reference("#/components/servers/1"), - Reference("#/components/servers/2"), - Reference("#/components/servers/3") + Reference("#/components/servers/1"), + Reference("#/components/servers/2"), + Reference("#/components/servers/3") )) .parameters(mapOf( Pair("userId", ParameterTest().build()), - Pair("userStatus", Reference("#/components/parameters/user-status")) + Pair("userStatus", + Reference("#/components/parameters/user-status") + ) )) .messages(mapOf( - Pair("changeStatus", Reference("#/components/parameters/user-status")), + Pair("changeStatus", + Reference("#/components/parameters/user-status") + ), Pair("message", MessageTestWithSchema().build()), Pair("message 2", MessageTestWithMultiFormatSchema().build()), Pair("message with reference", MessageTestWithReference().build()), @@ -51,7 +55,7 @@ class ChannelTest: SerDeTest() { .tags(listOf( TagTest().build(), TagTestWithReferenceToExternalDocs().build(), - Reference("#/components/tag") + Reference("#/components/tag") )) .externalDocs(ExternalDocumentationTest().build()) .build() @@ -102,16 +106,20 @@ class ChannelTestWithReference: SerDeTest() { .summary("messages about user events.") .description("This channel is used to exchange messages about users signing up") .servers(listOf( - Reference("#/components/servers/1"), - Reference("#/components/servers/2"), - Reference("#/components/servers/3") + Reference("#/components/servers/1"), + Reference("#/components/servers/2"), + Reference("#/components/servers/3") )) .parameters(mapOf( Pair("userId", ParameterTest().build()), - Pair("userStatus", Reference("#/components/parameters/user-status")) + Pair("userStatus", + Reference("#/components/parameters/user-status") + ) )) .messages(mapOf( - Pair("changeStatus", Reference("#/components/parameters/user-status")), + Pair("changeStatus", + Reference("#/components/parameters/user-status") + ), Pair("message", MessageTestWithSchema().build()), Pair("message 2", MessageTestWithMultiFormatSchema().build()), Pair("message with reference", MessageTestWithReference().build()), @@ -120,7 +128,7 @@ class ChannelTestWithReference: SerDeTest() { .tags(listOf( TagTest().build(), TagTestWithReferenceToExternalDocs().build(), - Reference("#/components/tag") + Reference("#/components/tag") )) .externalDocs(Reference("#/components/external-doc")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index f54d28e9..5d2ad0af 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag @@ -133,7 +133,7 @@ class MessageTestWithReference: SerDeTest() { Tag("user", null, null), Tag("signup", null, null), Tag("register", null, null), - Reference("#/components/tags/tag") + Reference("#/components/tags/tag") )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( @@ -145,7 +145,9 @@ class MessageTestWithReference: SerDeTest() { Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), - Pair("mercure", Reference("#/components/messageBindings/mercure")), + Pair("mercure", + Reference("#/components/messageBindings/mercure") + ), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), @@ -221,7 +223,7 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { Tag("user", null, null), Tag("signup", null, null), Tag("register", null, null), - Reference("#/components/tags/tag") + Reference("#/components/tags/tag") )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( @@ -233,7 +235,9 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), - Pair("mercure", Reference("#/components/messageBindings/mercure")), + Pair("mercure", + Reference("#/components/messageBindings/mercure") + ), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 1a8e246e..3106a3f8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag @@ -67,7 +67,9 @@ class MessageTraitTestWithSchema: SerDeTest() { Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), - Pair("mercure", Reference("#/components/messageBindings/mercure")), + Pair("mercure", + Reference("#/components/messageBindings/mercure") + ), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), @@ -108,7 +110,7 @@ class MessageTraitTestWithReference: SerDeTest() { Tag("user", null, null), Tag("signup", null, null), Tag("register", null, null), - Reference("#/components/tags/tag") + Reference("#/components/tags/tag") )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( @@ -120,7 +122,9 @@ class MessageTraitTestWithReference: SerDeTest() { Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), - Pair("mercure", Reference("#/components/messageBindings/mercure")), + Pair("mercure", + Reference("#/components/messageBindings/mercure") + ), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), @@ -178,7 +182,7 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { Tag("user", null, null), Tag("signup", null, null), Tag("register", null, null), - Reference("#/components/tags/tag") + Reference("#/components/tags/tag") )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( @@ -190,7 +194,9 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), - Pair("mercure", Reference("#/components/messageBindings/mercure")), + Pair("mercure", + Reference("#/components/messageBindings/mercure") + ), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt index 8d85f021..1225cfb5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.component -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.TagTest @@ -83,7 +83,9 @@ class ComponentsTest: SerDeTest() { )) .serverVariables(mapOf( Pair("port", ServerVariableTest().build()), - Pair("basePath", Reference("#/components/serverVariables/basePath")) + Pair("basePath", + Reference("#/components/serverVariables/basePath") + ) )) .channels(mapOf( Pair("channel 1", ChannelTest().build()), @@ -93,7 +95,9 @@ class ComponentsTest: SerDeTest() { .operations(mapOf( Pair("operation 1", OperationTest().build()), Pair("operation 2", OperationTestWithReference().build()), - Pair("operation 3", Reference("#/components/operations/operation")) + Pair("operation 3", + Reference("#/components/operations/operation") + ) )) .replies(mapOf( Pair("reply 1", OperationReplyTest().build()), @@ -102,7 +106,9 @@ class ComponentsTest: SerDeTest() { )) .replyAddresses(mapOf( Pair("reply addresses 1", OperationReplyAddressTest().build()), - Pair("reply addresses 2", Reference("#/components/replyAddresses/replyAddress")) + Pair("reply addresses 2", + Reference("#/components/replyAddresses/replyAddress") + ) )) .messages(mapOf( Pair("message 1", MessageTestWithSchema().build()), @@ -112,7 +118,9 @@ class ComponentsTest: SerDeTest() { )) .securitySchemes(mapOf( Pair("apiKey", ApiKeySecuritySchemeTest().build()), - Pair("asymmetricEncryption", Reference("#/components/securitySchemes/asymmetricEncryption")), + Pair("asymmetricEncryption", + Reference("#/components/securitySchemes/asymmetricEncryption") + ), Pair("gssapi", Reference("#/components/securitySchemes/gssapi")), Pair("oauth2", OAuth2SecuritySchemeTest().build()), Pair("openIdConnect", OpenIdConnectSecuritySchemeTest().build()), @@ -120,30 +128,46 @@ class ComponentsTest: SerDeTest() { Pair("httpBasic", HttpSecuritySchemeBasicTest().build()), Pair("httpBearer", HttpSecuritySchemeBearerTest().build()), Pair("plain", Reference("#/components/securitySchemes/plain")), - Pair("scramSha256", Reference("#/components/securitySchemes/scramSha256")), - Pair("scramSha512", Reference("#/components/securitySchemes/scramSha512")), - Pair("symmetricEncryption", Reference("#/components/securitySchemes/symmetricEncryption")), - Pair("userPassword", Reference("#/components/securitySchemes/userPassword")), + Pair("scramSha256", + Reference("#/components/securitySchemes/scramSha256") + ), + Pair("scramSha512", + Reference("#/components/securitySchemes/scramSha512") + ), + Pair("symmetricEncryption", + Reference("#/components/securitySchemes/symmetricEncryption") + ), + Pair("userPassword", + Reference("#/components/securitySchemes/userPassword") + ), Pair("X509", Reference("#/components/securitySchemes/X509")), )) .parameters(mapOf( Pair("parameter 1", ParameterTest().build()), - Pair("parameter 2", Reference("#/components/parameters/parameter")) + Pair("parameter 2", + Reference("#/components/parameters/parameter") + ) )) .correlationIds(mapOf( Pair("correlationId 1", CorrelationIdTest().build()), - Pair("correlationId 2", Reference("#/correlationIds/parameters/correlationId")) + Pair("correlationId 2", + Reference("#/correlationIds/parameters/correlationId") + ) )) .operationTraits(mapOf( Pair("operationTrait 1", OperationTraitTest().build()), Pair("operationTrait 2", OperationTraitTestWithReference().build()), - Pair("operationTrait 3", Reference("#/components/operationTraits/operationTrait")) + Pair("operationTrait 3", + Reference("#/components/operationTraits/operationTrait") + ) )) .messageTraits(mapOf( Pair("messageTrait 1", MessageTraitTestWithSchema().build()), Pair("messageTrait 2", MessageTraitTestWithMultiFormatSchema().build()), Pair("messageTrait 3", MessageTraitTestWithReference().build()), - Pair("messageTrait 4", Reference("#/components/messageTraits/messageTrait")) + Pair("messageTrait 4", + Reference("#/components/messageTraits/messageTrait") + ) )) .serverBindings(ServerTest.bindings()) .channelBindings(ChannelTest.bindings()) @@ -151,7 +175,9 @@ class ComponentsTest: SerDeTest() { .messageBindings(MessageTestWithSchema.bindings()) .externalDocs(mapOf( Pair("externalDoc 1", ExternalDocumentationTest().build()), - Pair("externalDoc 2", Reference("#/components/externalDocs/externalDoc")), + Pair("externalDoc 2", + Reference("#/components/externalDocs/externalDoc") + ), )) .tags(mapOf( Pair("tag 1", TagTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt index 9c2ccfbc..ec289400 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.TagTest @@ -52,7 +52,7 @@ class InfoTestWithReferences: SerDeTest() { ContactTest().build(), LicenseTest().build(), listOf(Reference("#/components/schemas/tag")), - Reference("#/components/schemas/externalDoc"), + Reference("#/components/schemas/externalDoc"), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 295ef12b..20f91d7f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBindingTest import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag @@ -36,25 +36,25 @@ class OperationTest: SerDeTest() { .description("Send message to remote server") .security(listOf( ApiKeySecuritySchemeTest().build(), - Reference("#/components/security/plain") + Reference("#/components/security/plain") )) .tags(listOf( Tag("messages", "operations with messages", ExternalDocumentation( "Messages validation rules", "messages/validation-rules" )), - Reference("#/components/tags/tag") + Reference("#/components/tags/tag") )) .externalDocs(ExternalDocumentation("Messages validation rules", "messages/validation-rules")) .bindings(bindings()) .traits(listOf( OperationTraitTest().build(), OperationTraitTestWithReference().build(), - Reference("#/components/operations/trait") + Reference("#/components/operations/trait") )) .messages(listOf( - Reference("#/components/messages/message 1"), - Reference("#/components/messages/message 2"), - Reference("#/components/messages/message 3"), + Reference("#/components/messages/message 1"), + Reference("#/components/messages/message 2"), + Reference("#/components/messages/message 3"), )) .reply(OperationReplyTest().build()) .build() @@ -65,8 +65,12 @@ class OperationTest: SerDeTest() { return mapOf( Pair("amqp", AMQPOperationBindingTest().build()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), - Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), - Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), + Pair("anypointmq", + Reference("#/components/operationBindings/anypointmq") + ), + Pair("googlepubsub", + Reference("#/components/operationBindings/googlepubsub") + ), Pair("http", HTTPOperationBindingTest().build()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), @@ -107,29 +111,37 @@ class OperationTestWithReference: SerDeTest() { .description("Send message to remote server") .security(listOf( ApiKeySecuritySchemeTest().build(), - Reference("#/components/security/plain") + Reference("#/components/security/plain") )) .tags(listOf( Tag("messages", "operations with messages", ExternalDocumentation( "Messages validation rules", "messages/validation-rules" )), - Reference("#/components/tags/tag") + Reference("#/components/tags/tag") )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( Pair("amqp", AMQPOperationBindingTest().build()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), - Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), - Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), + Pair("anypointmq", + Reference("#/components/operationBindings/anypointmq") + ), + Pair("googlepubsub", + Reference("#/components/operationBindings/googlepubsub") + ), Pair("http", HTTPOperationBindingTest().build()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaOperationBindingTest().build()), - Pair("mercure", Reference("#/components/operationBindings/mercure")), + Pair("mercure", + Reference("#/components/operationBindings/mercure") + ), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), Pair("nats", NATSOperationBindingTest().build()), - Pair("pulsar", Reference("#/components/operationBindings/pulsar")), + Pair("pulsar", + Reference("#/components/operationBindings/pulsar") + ), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), Pair("solace", SolaceOperationBindingTest().build()), @@ -140,12 +152,12 @@ class OperationTestWithReference: SerDeTest() { .traits(listOf( OperationTraitTest().build(), OperationTraitTestWithReference().build(), - Reference("#/components/operations/trait") + Reference("#/components/operations/trait") )) .messages(listOf( - Reference("#/components/messages/message 1"), - Reference("#/components/messages/message 2"), - Reference("#/components/messages/message 3"), + Reference("#/components/messages/message 1"), + Reference("#/components/messages/message 2"), + Reference("#/components/messages/message 3"), )) .reply(Reference("#/components/replies/reply")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 437f2ff3..469caf69 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -6,11 +6,10 @@ import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBindingTest import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag -import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyTest import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest /** @@ -34,29 +33,37 @@ class OperationTraitTest: SerDeTest() { .description("Send message to remote server") .security(listOf( ApiKeySecuritySchemeTest().build(), - Reference("#/components/security/plain") + Reference("#/components/security/plain") )) .tags(listOf( Tag("messages", "operations with messages", ExternalDocumentation( "Messages validation rules", "messages/validation-rules" )), - Reference("#/components/tags/tag") + Reference("#/components/tags/tag") )) .externalDocs(ExternalDocumentation("Messages validation rules", "messages/validation-rules")) .bindings(mapOf( Pair("amqp", AMQPOperationBindingTest().build()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), - Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), - Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), + Pair("anypointmq", + Reference("#/components/operationBindings/anypointmq") + ), + Pair("googlepubsub", + Reference("#/components/operationBindings/googlepubsub") + ), Pair("http", HTTPOperationBindingTest().build()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaOperationBindingTest().build()), - Pair("mercure", Reference("#/components/operationBindings/mercure")), + Pair("mercure", + Reference("#/components/operationBindings/mercure") + ), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), Pair("nats", NATSOperationBindingTest().build()), - Pair("pulsar", Reference("#/components/operationBindings/pulsar")), + Pair("pulsar", + Reference("#/components/operationBindings/pulsar") + ), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), Pair("solace", SolaceOperationBindingTest().build()), @@ -86,29 +93,37 @@ class OperationTraitTestWithReference: SerDeTest() { .description("Send message to remote server") .security(listOf( ApiKeySecuritySchemeTest().build(), - Reference("#/components/security/plain") + Reference("#/components/security/plain") )) .tags(listOf( Tag("messages", "operations with messages", ExternalDocumentation( "Messages validation rules", "messages/validation-rules" )), - Reference("#/components/tags/tag") + Reference("#/components/tags/tag") )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( Pair("amqp", AMQPOperationBindingTest().build()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), - Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), - Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), + Pair("anypointmq", + Reference("#/components/operationBindings/anypointmq") + ), + Pair("googlepubsub", + Reference("#/components/operationBindings/googlepubsub") + ), Pair("http", HTTPOperationBindingTest().build()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaOperationBindingTest().build()), - Pair("mercure", Reference("#/components/operationBindings/mercure")), + Pair("mercure", + Reference("#/components/operationBindings/mercure") + ), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), Pair("nats", NATSOperationBindingTest().build()), - Pair("pulsar", Reference("#/components/operationBindings/pulsar")), + Pair("pulsar", + Reference("#/components/operationBindings/pulsar") + ), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), Pair("solace", SolaceOperationBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt index 74af36c6..2b3adaf6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation.reply -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest /** @@ -22,9 +22,9 @@ class OperationReplyTest: SerDeTest() { .address(OperationReplyAddressTest().build()) .channel(Reference("#/components/channels/channel")) .messages(listOf( - Reference("#/components/messages/message 1"), - Reference("#/components/messages/message 2"), - Reference("#/components/messages/message 3"), + Reference("#/components/messages/message 1"), + Reference("#/components/messages/message 2"), + Reference("#/components/messages/message 3"), )) .build() } @@ -46,9 +46,9 @@ class OperationReplyTestWithReference: SerDeTest() { .address(Reference("#/components/addresses/address")) .channel(Reference("#/components/channels/channel")) .messages(listOf( - Reference("#/components/messages/message 1"), - Reference("#/components/messages/message 2"), - Reference("#/components/messages/message 3"), + Reference("#/components/messages/message 1"), + Reference("#/components/messages/message 2"), + Reference("#/components/messages/message 3"), )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 808155f3..ab4db1b2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.server -import com.asyncapi.v3.Reference +import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.Tag @@ -58,7 +58,9 @@ class ServerTest: SerDeTest() { .enumValues(listOf("8883", "8884")) .defaultValue("8883") .build()), - Pair("basePath", Reference("#/components/serverVariables/basePath")) + Pair("basePath", + Reference("#/components/serverVariables/basePath") + ) )) .security(listOf( ApiKeySecuritySchemeTest().build(), @@ -171,16 +173,18 @@ class ServerTestWithReference: SerDeTest() { .enumValues(listOf("8883", "8884")) .defaultValue("8883") .build()), - Pair("basePath", Reference("#/components/serverVariables/basePath")) + Pair("basePath", + Reference("#/components/serverVariables/basePath") + ) )) .security(listOf( ApiKeySecuritySchemeTest().build(), HttpSecuritySchemeBearerTest().build(), - Reference("#/components/securitySchemes/openId") + Reference("#/components/securitySchemes/openId") )) .tags(listOf( Tag("env:staging", "This environment is a replica of the production environment", null), - Reference("#/components/tags/tag_name") + Reference("#/components/tags/tag_name") )) .externalDocs(Reference("#/components/externalDocs/externalDoc")) .bindings(bindings()) From 83b2db9498c9f09e0a967b4ee53bbc579a21b080 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 23 Apr 2024 01:52:53 +0400 Subject: [PATCH 022/141] test(bindings): AMQP common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/166 --- .../_2_0/channel}/AMQPChannelBindingTest.kt | 4 +- .../_2_0/message}/AMQPMessageBindingTest.kt | 3 +- .../operation}/AMQPOperationBindingTest.kt | 3 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../channel/amqp/AMQPChannelBindingTest.kt | 44 ------------------- .../message/amqp/AMQPMessageBindingTest.kt | 23 ---------- .../amqp/AMQPOperationBindingTest.kt | 31 ------------- .../v3/_0_0/model/channel/ChannelTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v3/_0_0/model/operation/OperationTest.kt | 2 +- .../model/operation/OperationTraitTest.kt | 2 +- 21 files changed, 18 insertions(+), 120 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/channel/amqp => bindings/amqp/v0/_2_0/channel}/AMQPChannelBindingTest.kt (89%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/message/amqp => bindings/amqp/v0/_2_0/message}/AMQPMessageBindingTest.kt (85%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/operation/amqp => bindings/amqp/v0/_2_0/operation}/AMQPOperationBindingTest.kt (89%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/amqp/AMQPMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt similarity index 89% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt index 05dc96ab..00dfd1e6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/amqp/AMQPChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt @@ -1,8 +1,6 @@ -package com.asyncapi.v3.binding.channel.amqp +package com.asyncapi.bindings.amqp.v0._2_0.channel import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeProperties import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeType import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/amqp/AMQPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt similarity index 85% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/amqp/AMQPMessageBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt index 2edab852..6c786583 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/amqp/AMQPMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.message.amqp +package com.asyncapi.bindings.amqp.v0._2_0.message import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding class AMQPMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt similarity index 89% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt index 99cac152..47d63ead 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/amqp/AMQPOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.operation.amqp +package com.asyncapi.bindings.amqp.v0._2_0.operation import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding class AMQPOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 00c5a783..9e170796 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2._0_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._0_0.model.channel.operation.OperationWithReferenceToMessageTest import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.ChannelBinding -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding import com.asyncapi.v2.binding.channel.anypointmq.AnypointMQChannelBindingTest import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 721c06d6..5e6db7be 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.MessageBinding -import com.asyncapi.v2.binding.message.amqp.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index c2a13012..17563458 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.binding.message.amqp.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 74c1ef5c..d15d7d27 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.message.MessageTest import com.asyncapi.bindings.OperationBinding -import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index c27ffb77..76920be5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v2._0_0.model.channel.operation import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.Tag -import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 7a2425c8..43e03465 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTest import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.binding.channel.amqp.AMQPChannelBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.v2.binding.channel.anypointmq.AnypointMQChannelBindingTest import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBindingTest import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index 97d45408..9b190e43 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.binding.message.amqp.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 88c1941c..6f9a42fe 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.binding.message.amqp.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index a74c67c8..0688e949 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.message.MessageTest import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages -import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index a958a739..1405a91e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag -import com.asyncapi.v2.binding.operation.amqp.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBindingTest.kt deleted file mode 100644 index 05b41813..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/amqp/AMQPChannelBindingTest.kt +++ /dev/null @@ -1,44 +0,0 @@ -package com.asyncapi.v2.binding.channel.amqp - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType -import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeProperties -import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeType -import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class AMQPChannelBindingTest: SerDeTest() { - - override fun objectClass() = AMQPChannelBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/channel/amqp/amqpChannelBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/channel/amqp/amqpChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/channel/amqp/amqpChannelBinding - wrongly extended.json" - - override fun build(): AMQPChannelBinding { - return AMQPChannelBinding.builder() - .`is`(AMQPChannelType.ROUTING_KEY) - .queue(AMQPChannelQueueProperties.builder() - .name("my-queue-name") - .durable(true) - .exclusive(true) - .autoDelete(false) - .build() - ) - .exchange(AMQPChannelExchangeProperties.builder() - .name("myExchange") - .type(AMQPChannelExchangeType.TOPIC) - .durable(true) - .autoDelete(false) - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/amqp/AMQPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/amqp/AMQPMessageBindingTest.kt deleted file mode 100644 index 9f28ad54..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/amqp/AMQPMessageBindingTest.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.asyncapi.v2.binding.message.amqp - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding - -class AMQPMessageBindingTest: SerDeTest() { - - override fun objectClass() = AMQPMessageBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/message/amqp/amqpMessageBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/message/amqp/amqpMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/message/amqp/amqpMessageBinding - wrongly extended.json" - - override fun build(): AMQPMessageBinding { - return AMQPMessageBinding.builder() - .contentEncoding("gzip") - .messageType("user.signup") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBindingTest.kt deleted file mode 100644 index 4e4a2fe8..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/amqp/AMQPOperationBindingTest.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.asyncapi.v2.binding.operation.amqp - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding - -class AMQPOperationBindingTest: SerDeTest() { - - override fun objectClass() = AMQPOperationBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/operation/amqp/amqpOperationBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/operation/amqp/amqpOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/operation/amqp/amqpOperationBinding - wrongly extended.json" - - override fun build(): AMQPOperationBinding { - return AMQPOperationBinding.builder() - .expiration(100_000) - .userId("guest") - .cc(listOf("user.logs")) - .priority(10) - .deliveryMode(2) - .mandatory(false) - .bcc(listOf("external.audit")) - .replyTo("user.signedup") - .timestamp(true) - .ack(false) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index c05ccdbd..1e22923b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v3._0_0.model.TagTestWithReferenceToExternalDocs import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithMultiFormatSchema import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithReference import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithSchema -import com.asyncapi.v3.binding.channel.amqp.AMQPChannelBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.v3.binding.channel.anypointmq.AnypointMQChannelBindingTest import com.asyncapi.v3.binding.channel.googlepubsub.GooglePubSubChannelBindingTest import com.asyncapi.v3.binding.channel.ibmmq.IBMMQChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 5d2ad0af..4fb3ca67 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag -import com.asyncapi.v3.binding.message.amqp.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.v3.binding.message.anypointmq.AnypointMQMessageBindingTest import com.asyncapi.v3.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 3106a3f8..79fc7b5e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.binding.message.amqp.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.v3.binding.message.anypointmq.AnypointMQMessageBindingTest import com.asyncapi.v3.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 20f91d7f..72e5e3e6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation -import com.asyncapi.v3.binding.operation.amqp.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.v3.binding.operation.http.HTTPOperationBindingTest import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBindingTest import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 469caf69..9585fa52 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation -import com.asyncapi.v3.binding.operation.amqp.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.v3.binding.operation.http.HTTPOperationBindingTest import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBindingTest import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest From 1275d1b6930db89f53382ec3cb43e067ef83ee96 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 23 Apr 2024 01:57:57 +0400 Subject: [PATCH 023/141] test(bindings): Anypoint MQ common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/168 --- .../channel}/AnypointMQChannelBindingTest.kt | 4 +-- .../message}/AnypointMQMessageBindingTest.kt | 3 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../AnypointMQChannelBindingTest.kt | 28 --------------- .../AnypointMQMessageBindingTest.kt | 35 ------------------- .../v3/_0_0/model/channel/ChannelTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- 13 files changed, 11 insertions(+), 77 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/channel/anypointmq => bindings/anypointmq/v0/_0_1/channel}/AnypointMQChannelBindingTest.kt (79%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/message/anypointmq => bindings/anypointmq/v0/_0_1/message}/AnypointMQMessageBindingTest.kt (91%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt similarity index 79% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt index 40fc730c..95888eec 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt @@ -1,8 +1,6 @@ -package com.asyncapi.v3.binding.channel.anypointmq +package com.asyncapi.bindings.anypointmq.v0._0_1.channel import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelDestinationType /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt similarity index 91% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt index 4fc41561..67661143 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/anypointmq/AnypointMQMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt @@ -1,9 +1,8 @@ -package com.asyncapi.v3.binding.message.anypointmq +package com.asyncapi.bindings.anypointmq.v0._0_1.message import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding class AnypointMQMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 9e170796..82efdd21 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.ChannelBinding import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding -import com.asyncapi.v2.binding.channel.anypointmq.AnypointMQChannelBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBindingTest import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 5e6db7be..f248d7fa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.MessageBinding import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding -import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 17563458..f858c3d4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding -import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 43e03465..3bd26f2b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTest import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest -import com.asyncapi.v2.binding.channel.anypointmq.AnypointMQChannelBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBindingTest import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index 9b190e43..d491ed96 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest -import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 6f9a42fe..d33142ce 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest -import com.asyncapi.v2.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt deleted file mode 100644 index b19a37d6..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/anypointmq/AnypointMQChannelBindingTest.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.asyncapi.v2.binding.channel.anypointmq - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelDestinationType - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class AnypointMQChannelBindingTest: SerDeTest() { - - override fun objectClass() = AnypointMQChannelBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/channel/anypoint/anypointMQChannelBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/channel/anypoint/anypointMQChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/channel/anypoint/anypointMQChannelBinding - wrongly extended.json" - - override fun build(): AnypointMQChannelBinding { - return AnypointMQChannelBinding.builder() - .destination("user-signup-exchg") - .destinationType(AnypointMQChannelDestinationType.EXCHANGE) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt deleted file mode 100644 index 1967465c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/anypointmq/AnypointMQMessageBindingTest.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.asyncapi.v2.binding.message.anypointmq - -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding -import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Type -import com.asyncapi.v3.schema.AsyncAPISchema - -class AnypointMQMessageBindingTest: SerDeTest() { - - override fun objectClass() = AnypointMQMessageBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/message/anypointmq/anypointMQMessageBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/message/anypointmq/anypointMQMessageBinding - wrongly extended.json" - - override fun build(): AnypointMQMessageBinding { - return AnypointMQMessageBinding.builder() - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(mapOf( - Pair( - "correlationId", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Correlation ID set by application") - .build() - ) - )) - .build()) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 1e22923b..ae76f255 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithMultiFormatSche import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithReference import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithSchema import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest -import com.asyncapi.v3.binding.channel.anypointmq.AnypointMQChannelBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.v3.binding.channel.googlepubsub.GooglePubSubChannelBindingTest import com.asyncapi.v3.binding.channel.ibmmq.IBMMQChannelBindingTest import com.asyncapi.v3.binding.channel.kafka.KafkaChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 4fb3ca67..161ef906 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest -import com.asyncapi.v3.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v3.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v3.binding.message.ibmmq.IBMMQMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 79fc7b5e..6a7be0bd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest -import com.asyncapi.v3.binding.message.anypointmq.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.v3.binding.message.googlepubsub.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v3.binding.message.ibmmq.IBMMQMessageBindingTest From 72da5c57e74b8199cfd1b89ae0bf53bd100ee6d9 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 13:09:14 +0400 Subject: [PATCH 024/141] test(bindings): Google Pub/Sub common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/169 --- .../GooglePubSubChannelBindingTest.kt | 5 +-- .../GooglePubSubMessageBindingTest.kt | 5 +-- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../GooglePubSubChannelBindingTest.kt | 45 ------------------- .../GooglePubSubMessageBindingTest.kt | 27 ----------- .../v3/_0_0/model/channel/ChannelTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- 13 files changed, 11 insertions(+), 89 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/channel/googlepubsub => bindings/googlepubsub/v0/_1_0/channel}/GooglePubSubChannelBindingTest.kt (83%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/message/googlepubsub => bindings/googlepubsub/v0/_1_0/message}/GooglePubSubMessageBindingTest.kt (73%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt similarity index 83% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt index 06cc8361..e9859c65 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt @@ -1,9 +1,6 @@ -package com.asyncapi.v3.binding.channel.googlepubsub +package com.asyncapi.bindings.googlepubsub.v0._1_0.channel import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelMessageStoragePolicy -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelSchemaSettings class GooglePubSubChannelBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt similarity index 73% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt index 3390e0e3..953fb339 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt @@ -1,9 +1,6 @@ -package com.asyncapi.v3.binding.message.googlepubsub +package com.asyncapi.bindings.googlepubsub.v0._1_0.message import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinition -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinitionType class GooglePubSubMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 82efdd21..48e076dc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.bindings.ChannelBinding import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest -import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBindingTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index f248d7fa..d596a1b8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.MessageBinding import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest -import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index f858c3d4..dac03c0d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest -import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 3bd26f2b..c39eb558 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTes import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest -import com.asyncapi.v2.binding.channel.googlepubsub.GooglePubSubChannelBindingTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index d491ed96..d27f4354 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest -import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index d33142ce..c95baa32 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest -import com.asyncapi.v2.binding.message.googlepubsub.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt deleted file mode 100644 index 02400db5..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/googlepubsub/GooglePubSubChannelBindingTest.kt +++ /dev/null @@ -1,45 +0,0 @@ -package com.asyncapi.v2.binding.channel.googlepubsub - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelMessageStoragePolicy -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelSchemaSettings - -class GooglePubSubChannelBindingTest: SerDeTest() { - - override fun objectClass() = GooglePubSubChannelBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - wrongly extended.json" - - override fun build(): GooglePubSubChannelBinding { - return GooglePubSubChannelBinding.builder() - .topic("projects/your-project/topics/topic-proto-schema") - .messageRetentionDuration("86400s") - .messageStoragePolicy(GooglePubSubChannelMessageStoragePolicy( - listOf( - "us-central1", - "us-central2", - "us-east1", - "us-east4", - "us-east5", - "us-east7", - "us-south1", - "us-west1", - "us-west2", - "us-west3", - "us-west4" - ) - )) - .schemaSettings(GooglePubSubChannelSchemaSettings.builder() - .encoding("binary") - .name("projects/your-project/schemas/message-proto") - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt deleted file mode 100644 index 1f147927..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/googlepubsub/GooglePubSubMessageBindingTest.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.asyncapi.v2.binding.message.googlepubsub - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinition -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinitionType - -class GooglePubSubMessageBindingTest: SerDeTest() { - - override fun objectClass() = GooglePubSubMessageBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - wrongly extended.json" - - override fun build(): GooglePubSubMessageBinding { - return GooglePubSubMessageBinding.builder() - .schema(GooglePubSubMessageSchemaDefinition( - "projects/your-project/schemas/message-avro", - GooglePubSubMessageSchemaDefinitionType.AVRO - )) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index ae76f255..d6eb02d2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithReference import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithSchema import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest -import com.asyncapi.v3.binding.channel.googlepubsub.GooglePubSubChannelBindingTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.v3.binding.channel.ibmmq.IBMMQChannelBindingTest import com.asyncapi.v3.binding.channel.kafka.KafkaChannelBindingTest import com.asyncapi.v3.binding.channel.pulsar.PulsarChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 161ef906..d5b51702 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest -import com.asyncapi.v3.binding.message.googlepubsub.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v3.binding.message.ibmmq.IBMMQMessageBindingTest import com.asyncapi.v3.binding.message.kafka.KafkaMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 6a7be0bd..8d810e09 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest -import com.asyncapi.v3.binding.message.googlepubsub.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest import com.asyncapi.v3.binding.message.ibmmq.IBMMQMessageBindingTest import com.asyncapi.v3.binding.message.kafka.KafkaMessageBindingTest From d930c76d667ad2254a791f965b7f0370682f6968 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 13:14:22 +0400 Subject: [PATCH 025/141] test(bindings): IBM MQ common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/171 --- .../_1_0/channel}/IBMMQChannelBindingTest.kt | 6 +-- .../_1_0/message}/IBMMQMessageBindingTest.kt | 4 +- .../v0/_1_0/server}/IBMMQServerBindingTest.kt | 3 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../channel/ibmmq/IBMMQChannelBindingTest.kt | 39 ------------------- .../message/ibmmq/IBMMQMessageBindingTest.kt | 26 ------------- .../server/ibmmq/IBMMQServerBindingTest.kt | 27 ------------- .../v3/_0_0/model/channel/ChannelTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- 15 files changed, 12 insertions(+), 111 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/channel/ibmmq => bindings/ibmmq/v0/_1_0/channel}/IBMMQChannelBindingTest.kt (78%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/message/ibmmq => bindings/ibmmq/v0/_1_0/message}/IBMMQMessageBindingTest.kt (81%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/server/ibmmq => bindings/ibmmq/v0/_1_0/server}/IBMMQServerBindingTest.kt (86%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt similarity index 78% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt index a5768853..0e839f24 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ibmmq/IBMMQChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt @@ -1,10 +1,6 @@ -package com.asyncapi.v3.binding.channel.ibmmq +package com.asyncapi.bindings.ibmmq.v0._1_0.channel import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelDestinationType -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelQueueProperties -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelTopicProperties class IBMMQChannelBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt similarity index 81% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt index 1c6d4817..bf0e2b95 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/ibmmq/IBMMQMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt @@ -1,8 +1,6 @@ -package com.asyncapi.v3.binding.message.ibmmq +package com.asyncapi.bindings.ibmmq.v0._1_0.message import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageType class IBMMQMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt similarity index 86% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt index 57004b2c..515a7201 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/ibmmq/IBMMQServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.server.ibmmq +package com.asyncapi.bindings.ibmmq.v0._1_0.server import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 48e076dc..7068222b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding -import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index d596a1b8..9eaf9911 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest -import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index dac03c0d..b8f0d1b1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest -import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index c39eb558..259985ae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest -import com.asyncapi.v2.binding.channel.ibmmq.IBMMQChannelBindingTest +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index d27f4354..bea20ad6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest -import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index c95baa32..5ebda4ab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest -import com.asyncapi.v2.binding.message.ibmmq.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBindingTest.kt deleted file mode 100644 index d93f7cf4..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ibmmq/IBMMQChannelBindingTest.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.v2.binding.channel.ibmmq - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelDestinationType -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelQueueProperties -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelTopicProperties - -class IBMMQChannelBindingTest: SerDeTest() { - - override fun objectClass() = IBMMQChannelBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/channel/ibmmq/ibmMQChannelBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - wrongly extended.json" - - override fun build(): IBMMQChannelBinding { - return IBMMQChannelBinding.builder() - .destinationType(IBMMQChannelDestinationType.TOPIC) - .queue(IBMMQChannelQueueProperties.builder() - .objectName("message") - .isPartitioned(false) - .exclusive(true) - .build() - ) - .topic(IBMMQChannelTopicProperties.builder() - .string("messages") - .objectName("message") - .durablePermitted(true) - .lastMsgRetained(true) - .build() - ) - .maxMsgLength(1024) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBindingTest.kt deleted file mode 100644 index 0d65208c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/ibmmq/IBMMQMessageBindingTest.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.asyncapi.v2.binding.message.ibmmq - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageType - -class IBMMQMessageBindingTest: SerDeTest() { - - override fun objectClass() = IBMMQMessageBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/message/ibmmq/ibmMQMessageBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/message/ibmmq/ibmMQMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/message/ibmmq/ibmMQMessageBinding - wrongly extended.json" - - override fun build(): IBMMQMessageBinding { - return IBMMQMessageBinding.builder() - .type(IBMMQMessageType.JMS) - .description("JMS stream message") - .headers("Content-Type: application/json") - .expiry(0) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBindingTest.kt deleted file mode 100644 index ad7cc167..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/ibmmq/IBMMQServerBindingTest.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.asyncapi.v2.binding.server.ibmmq - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class IBMMQServerBindingTest: SerDeTest() { - - override fun objectClass() = IBMMQServerBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/server/ibmmq/ibmmqServerBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/server/ibmmq/ibmmqServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/server/ibmmq/ibmmqServerBinding - wrongly extended.json" - - override fun build(): IBMMQServerBinding { - return IBMMQServerBinding.builder() - .groupId("PRODCLSTR1") - .cipherSpec("ANY_TLS12_OR_HIGHER") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index d6eb02d2..3cd2e414 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithSchema import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest -import com.asyncapi.v3.binding.channel.ibmmq.IBMMQChannelBindingTest +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.v3.binding.channel.kafka.KafkaChannelBindingTest import com.asyncapi.v3.binding.channel.pulsar.PulsarChannelBindingTest import com.asyncapi.v3.binding.channel.ws.WebSocketsChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index d5b51702..b8c7446f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest -import com.asyncapi.v3.binding.message.ibmmq.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.v3.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v3.schema.AsyncAPISchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 8d810e09..41b9ecf7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest -import com.asyncapi.v3.binding.message.ibmmq.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.v3.binding.message.kafka.KafkaMessageBindingTest import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema From e5d65d1c2c525c75ccbee5ad7b40e9c0255cb97f Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 13:23:07 +0400 Subject: [PATCH 026/141] test(bindings): Kafka common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/173 --- .../_4_0/channel}/KafkaChannelBindingTest.kt | 5 +-- .../_4_0/message}/KafkaMessageBindingTest.kt | 4 +- .../operation}/KafkaOperationBindingTest.kt | 3 +- .../v0/_4_0/server}/KafkaServerBindingTest.kt | 3 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../channel/kafka/KafkaChannelBindingTest.kt | 41 ------------------- .../message/kafka/KafkaMessageBindingTest.kt | 31 -------------- .../kafka/KafkaOperationBindingTest.kt | 31 -------------- .../server/kafka/KafkaServerBindingTest.kt | 27 ------------ .../v3/_0_0/model/channel/ChannelTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v3/_0_0/model/operation/OperationTest.kt | 2 +- .../model/operation/OperationTraitTest.kt | 2 +- 23 files changed, 19 insertions(+), 156 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/channel/kafka => bindings/kafka/v0/_4_0/channel}/KafkaChannelBindingTest.kt (82%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/message/kafka => bindings/kafka/v0/_4_0/message}/KafkaMessageBindingTest.kt (84%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/operation/kafka => bindings/kafka/v0/_4_0/operation}/KafkaOperationBindingTest.kt (89%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/server/kafka => bindings/kafka/v0/_4_0/server}/KafkaServerBindingTest.kt (87%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/kafka/KafkaMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/kafka/KafkaServerBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt similarity index 82% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt index eac29010..1d5e8fa6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/kafka/KafkaChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt @@ -1,9 +1,6 @@ -package com.asyncapi.v3.binding.channel.kafka +package com.asyncapi.bindings.kafka.v0._4_0.channel import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicCleanupPolicy -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguration /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/kafka/KafkaMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt similarity index 84% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/kafka/KafkaMessageBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt index 84eae1a7..0b33875c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/kafka/KafkaMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt @@ -1,10 +1,8 @@ -package com.asyncapi.v3.binding.message.kafka +package com.asyncapi.bindings.kafka.v0._4_0.message import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageSchemaIdLocation class KafkaMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt similarity index 89% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt index 7c176bb8..bdb7f8ce 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/kafka/KafkaOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt @@ -1,9 +1,8 @@ -package com.asyncapi.v3.binding.operation.kafka +package com.asyncapi.bindings.kafka.v0._4_0.operation import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding class KafkaOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/kafka/KafkaServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt similarity index 87% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/kafka/KafkaServerBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt index 1bb282ec..f946e82b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/kafka/KafkaServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.server.kafka +package com.asyncapi.bindings.kafka.v0._4_0.server import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 7068222b..796b7832 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBin import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding -import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 9eaf9911..7ce1917b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBin import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding -import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index b8f0d1b1..3e47baba 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBin import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding -import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index d15d7d27..22eac6aa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperatio import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 76920be5..8cfaaa8a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperatio import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 259985ae..860747b1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest -import com.asyncapi.v2.binding.channel.kafka.KafkaChannelBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index bea20ad6..f0dbb93b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest -import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest class MessageTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 5ebda4ab..a042bee3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest -import com.asyncapi.v2.binding.message.kafka.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest class MessageTraitTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 0688e949..60ef9119 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2._6_0.model.channel.message.MessageTest import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 1405a91e..e6d0851a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBindingTest.kt deleted file mode 100644 index d505bdfe..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/kafka/KafkaChannelBindingTest.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.asyncapi.v2.binding.channel.kafka - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguration -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicCleanupPolicy - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class KafkaChannelBindingTest: SerDeTest() { - - override fun objectClass() = KafkaChannelBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/channel/kafka/kafkaChannelBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/channel/kafka/kafkaChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/channel/kafka/kafkaChannelBinding - wrongly extended.json" - - override fun build(): KafkaChannelBinding { - return KafkaChannelBinding.builder() - .topic("my-specific-topic-name") - .partitions(20) - .replicas(3) - .topicConfiguration(KafkaChannelTopicConfiguration.builder() - .cleanupPolicy(listOf( - KafkaChannelTopicCleanupPolicy.DELETE, - KafkaChannelTopicCleanupPolicy.COMPACT - )) - .retentionMs(604_800_000) - .retentionBytes(1_000_000_000) - .deleteRetentionMs(86_400_000) - .maxMessageBytes(1_048_588) - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/kafka/KafkaMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/kafka/KafkaMessageBindingTest.kt deleted file mode 100644 index ade09c08..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/kafka/KafkaMessageBindingTest.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.asyncapi.v2.binding.message.kafka - -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageSchemaIdLocation -import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Type -import com.asyncapi.v3.schema.AsyncAPISchema - -class KafkaMessageBindingTest: SerDeTest() { - - override fun objectClass() = KafkaMessageBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/message/kafka/kafkaMessageBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/message/kafka/kafkaMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/message/kafka/kafkaMessageBinding - wrongly extended.json" - - override fun build(): KafkaMessageBinding { - return KafkaMessageBinding.builder() - .key(AsyncAPISchema.builder() - .type(Type.STRING) - .enumValue(listOf("myKey")) - .build()) - .schemaIdLocation(KafkaMessageSchemaIdLocation.PAYLOAD) - .schemaIdPayloadEncoding("apicurio-new") - .schemaLookupStrategy("TopicIdStrategy") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBindingTest.kt deleted file mode 100644 index 3d185712..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/kafka/KafkaOperationBindingTest.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.asyncapi.v2.binding.operation.kafka - -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Type -import com.asyncapi.v3.schema.AsyncAPISchema - -class KafkaOperationBindingTest: SerDeTest() { - - override fun objectClass() = KafkaOperationBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/operation/kafka/kafkaOperationBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/operation/kafka/kafkaOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/operation/kafka/kafkaOperationBinding - wrongly extended.json" - - override fun build(): KafkaOperationBinding { - return KafkaOperationBinding.builder() - .groupId(AsyncAPISchema.builder() - .type(Type.STRING) - .enumValue(listOf("myGroupId")) - .build()) - .clientId(AsyncAPISchema.builder() - .type(Type.STRING) - .enumValue(listOf("myClientId")) - .build()) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/kafka/KafkaServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/kafka/KafkaServerBindingTest.kt deleted file mode 100644 index fe930e6c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/kafka/KafkaServerBindingTest.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.asyncapi.v2.binding.server.kafka - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class KafkaServerBindingTest: SerDeTest() { - - override fun objectClass() = KafkaServerBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/server/kafka/kafkaServerBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/server/kafka/kafkaServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/server/kafka/kafkaServerBinding - wrongly extended.json" - - override fun build(): KafkaServerBinding { - return KafkaServerBinding.builder() - .schemaRegistryUrl("https://my-schema-registry.com") - .schemaRegistryVendor("confluent") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 3cd2e414..2f53e6c2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest -import com.asyncapi.v3.binding.channel.kafka.KafkaChannelBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.v3.binding.channel.pulsar.PulsarChannelBindingTest import com.asyncapi.v3.binding.channel.ws.WebSocketsChannelBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index b8c7446f..fe22170e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest -import com.asyncapi.v3.binding.message.kafka.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 41b9ecf7..1e8ab0ef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest -import com.asyncapi.v3.binding.message.kafka.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBindingTest import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 72e5e3e6..54c77902 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.v3.binding.operation.http.HTTPOperationBindingTest -import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 9585fa52..912d6b4d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.v3.binding.operation.http.HTTPOperationBindingTest -import com.asyncapi.v3.binding.operation.kafka.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest From 4fa8c0c8ac30bfac4ff5afb1682c6ab8b5b2cda9 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 13:28:24 +0400 Subject: [PATCH 027/141] test(bindings): Pulsar common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/177 --- .../_1_0/channel}/PulsarChannelBindingTest.kt | 5 +-- .../_1_0/server}/PulsarServerBindingTest.kt | 3 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 2 +- .../pulsar/PulsarChannelBindingTest.kt | 34 ------------------- .../server/pulsar/PulsarServerBindingTest.kt | 26 -------------- .../v3/_0_0/model/channel/ChannelTest.kt | 2 +- 7 files changed, 5 insertions(+), 69 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/channel/pulsar => bindings/pulsar/v0/_1_0/channel}/PulsarChannelBindingTest.kt (79%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/server/pulsar => bindings/pulsar/v0/_1_0/server}/PulsarServerBindingTest.kt (85%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/pulsar/PulsarServerBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt similarity index 79% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt index 3bad39d7..f061926c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/pulsar/PulsarChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt @@ -1,9 +1,6 @@ -package com.asyncapi.v3.binding.channel.pulsar +package com.asyncapi.bindings.pulsar.v0._1_0.channel import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelPersistence -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelRetentionDefinition class PulsarChannelBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/pulsar/PulsarServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt similarity index 85% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/pulsar/PulsarServerBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt index 75b33dcc..760591fe 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/pulsar/PulsarServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.server.pulsar +package com.asyncapi.bindings.pulsar.v0._1_0.server import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 796b7832..0e6e350f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding -import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 860747b1..cab61d58 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest -import com.asyncapi.v2.binding.channel.pulsar.PulsarChannelBindingTest +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBindingTest class ChannelItemTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBindingTest.kt deleted file mode 100644 index 8a9076d1..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/pulsar/PulsarChannelBindingTest.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.asyncapi.v2.binding.channel.pulsar - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelPersistence -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelRetentionDefinition - -class PulsarChannelBindingTest: SerDeTest() { - - override fun objectClass() = PulsarChannelBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/channel/pulsar/pulsarChannelBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/channel/pulsar/pulsarChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/channel/pulsar/pulsarChannelBinding - wrongly extended.json" - - override fun build(): PulsarChannelBinding { - return PulsarChannelBinding.builder() - .namespace("staging") - .persistence(PulsarChannelPersistence.PERSISTENT) - .compaction(1000) - .geoReplication(listOf("us-east1", "us-west1")) - .retention(PulsarChannelRetentionDefinition.builder() - .time(7) - .size(1000) - .build() - ) - .ttl(360) - .deduplication(false) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/pulsar/PulsarServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/pulsar/PulsarServerBindingTest.kt deleted file mode 100644 index 627800a1..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/pulsar/PulsarServerBindingTest.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.asyncapi.v2.binding.server.pulsar - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class PulsarServerBindingTest: SerDeTest() { - - override fun objectClass() = PulsarServerBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/server/pulsar/pulsarServerBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/server/pulsar/pulsarServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/server/pulsar/pulsarServerBinding - wrongly extended.json" - - override fun build(): PulsarServerBinding { - return PulsarServerBinding.builder() - .tenant("contoso") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 2f53e6c2..1fac3129 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest -import com.asyncapi.v3.binding.channel.pulsar.PulsarChannelBindingTest +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest import com.asyncapi.v3.binding.channel.ws.WebSocketsChannelBindingTest class ChannelTest: SerDeTest() { From fae349ba16059a607ea468ee7401076a82b14c0a Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 13:30:51 +0400 Subject: [PATCH 028/141] test(bindings): WebSockets common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/183 --- .../channel}/WebSocketsChannelBindingTest.kt | 4 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 2 +- .../ws/WebSocketsChannelBindingTest.kt | 55 ------------------- .../v3/_0_0/model/channel/ChannelTest.kt | 2 +- 5 files changed, 4 insertions(+), 61 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/channel/ws => bindings/websockets/v0/_1_0/channel}/WebSocketsChannelBindingTest.kt (90%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt similarity index 90% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt index 0887dfa6..bfca679f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/channel/ws/WebSocketsChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt @@ -1,10 +1,8 @@ -package com.asyncapi.v3.binding.channel.ws +package com.asyncapi.bindings.websockets.v0._1_0.channel import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 0e6e350f..32aa6ca3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -23,7 +23,7 @@ import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding -import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBindingTest +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBindingTest class ChannelItemTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index cab61d58..97b43f11 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBin import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest -import com.asyncapi.v2.binding.channel.ws.WebSocketsChannelBindingTest +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBindingTest class ChannelItemTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBindingTest.kt deleted file mode 100644 index 67bcaa2d..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/channel/ws/WebSocketsChannelBindingTest.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.asyncapi.v2.binding.channel.ws - -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod -import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Type -import com.asyncapi.v3.schema.AsyncAPISchema - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class WebSocketsChannelBindingTest: SerDeTest() { - - override fun objectClass() = WebSocketsChannelBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/channel/ws/webSocketsChannelBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/channel/ws/webSocketsChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/channel/ws/webSocketsChannelBinding - wrongly extended.json" - - override fun build(): WebSocketsChannelBinding { - return WebSocketsChannelBinding.builder() - .method(WebSocketsChannelMethod.GET) - .query(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(mapOf( - Pair( - "ref", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Referral.") - .build() - ) - )) - .build() - ) - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(mapOf( - Pair( - "Authentication", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Authentication token") - .build() - ) - )) - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 1fac3129..33584a3c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBin import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest -import com.asyncapi.v3.binding.channel.ws.WebSocketsChannelBindingTest +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBindingTest class ChannelTest: SerDeTest() { From c47341f653aa1b595d94b71652b04abf8ad76e8f Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 14:09:08 +0400 Subject: [PATCH 029/141] test(bindings): HTTP common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/170 --- .../_1_0/message}/HTTPMessageBindingTest.kt | 3 +- .../operation}/HTTPOperationBindingTest.kt | 5 +-- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../message/http/HTTPMessageBindingTest.kt | 35 --------------- .../http/HTTPOperationBindingTest.kt | 44 ------------------- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v3/_0_0/model/operation/OperationTest.kt | 2 +- .../model/operation/OperationTraitTest.kt | 2 +- 16 files changed, 14 insertions(+), 97 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/message/http => bindings/http/v0/_1_0/message}/HTTPMessageBindingTest.kt (91%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/operation/http => bindings/http/v0/_1_0/operation}/HTTPOperationBindingTest.kt (86%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/http/HTTPMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/http/HTTPOperationBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/http/HTTPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt similarity index 91% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/http/HTTPMessageBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt index cd723da1..75bd878b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/http/HTTPMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt @@ -1,9 +1,8 @@ -package com.asyncapi.v3.binding.message.http +package com.asyncapi.bindings.http.v0._1_0.message import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding class HTTPMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/http/HTTPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt similarity index 86% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/http/HTTPOperationBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt index ac67acae..f3682742 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/http/HTTPOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt @@ -1,11 +1,8 @@ -package com.asyncapi.v3.binding.operation.http +package com.asyncapi.bindings.http.v0._1_0.operation import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.Type -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod import java.math.BigDecimal class HTTPOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 7ce1917b..d2272a1a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest -import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 3e47baba..731f88a0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest -import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 22eac6aa..d3256f4a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 8cfaaa8a..66cf911e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding -import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index f0dbb93b..e1514ea1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest -import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index a042bee3..7719a864 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest -import com.asyncapi.v2.binding.message.http.HTTPMessageBindingTest +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 60ef9119..a932f5fa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.message.MessageTest import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest -import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index e6d0851a..fb9ebaa8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest -import com.asyncapi.v2.binding.operation.http.HTTPOperationBindingTest +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/http/HTTPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/http/HTTPMessageBindingTest.kt deleted file mode 100644 index 32d0c9cd..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/http/HTTPMessageBindingTest.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.asyncapi.v2.binding.message.http - -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding -import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Type -import com.asyncapi.v3.schema.AsyncAPISchema - -class HTTPMessageBindingTest: SerDeTest() { - - override fun objectClass() = HTTPMessageBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/message/http/httpMessageBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/message/http/httpMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/message/http/httpMessageBinding - wrongly extended.json" - - override fun build(): HTTPMessageBinding { - return HTTPMessageBinding.builder() - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(mapOf( - Pair( - "Content-Type", - AsyncAPISchema.builder() - .type(Type.STRING) - .enumValue(listOf("application/json")) - .build() - ) - )) - .build()) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/http/HTTPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/http/HTTPOperationBindingTest.kt deleted file mode 100644 index 0ff6e3a2..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/http/HTTPOperationBindingTest.kt +++ /dev/null @@ -1,44 +0,0 @@ -package com.asyncapi.v2.binding.operation.http - -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType -import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Type -import com.asyncapi.v3.schema.AsyncAPISchema -import java.math.BigDecimal - -class HTTPOperationBindingTest: SerDeTest() { - - override fun objectClass() = HTTPOperationBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/operation/http/httpOperationBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/operation/http/httpOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/operation/http/httpOperationBinding - wrongly extended.json" - - override fun build(): HTTPOperationBinding { - return HTTPOperationBinding.builder() - .type(HTTPOperationType.REQUEST) - .method(HTTPOperationMethod.GET) - .query(AsyncAPISchema.builder() - .type(Type.OBJECT) - .required(listOf("companyId")) - .properties(mapOf( - Pair( - "companyId", - AsyncAPISchema.builder() - .type(Type.NUMBER) - .minimum(BigDecimal.ONE) - .description("The Id of the company.") - .build() - ) - )) - .additionalProperties(false) - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index fe22170e..8bfbf1cc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest -import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 1e8ab0ef..336d757d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest -import com.asyncapi.v3.binding.message.http.HTTPMessageBindingTest +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 54c77902..c26dfb20 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest -import com.asyncapi.v3.binding.operation.http.HTTPOperationBindingTest +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 912d6b4d..574bbbfc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest -import com.asyncapi.v3.binding.operation.http.HTTPOperationBindingTest +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest From 80642860b8e60a66d7caac86e81d0cbfe6f1eead Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 14:12:52 +0400 Subject: [PATCH 030/141] test(bindings): MQTT common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/175 --- .../_1_0/message}/MQTTMessageBindingTest.kt | 3 +- .../operation}/MQTTOperationBindingTest.kt | 3 +- .../v0/_1_0/server}/MQTTServerBindingTest.kt | 4 +-- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../message/mqtt/MQTTMessageBindingTest.kt | 21 ----------- .../mqtt/MQTTOperationBindingTest.kt | 23 ------------ .../server/mqtt/MQTTServerBindingTest.kt | 35 ------------------- .../_0_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../v3/_0_0/model/operation/OperationTest.kt | 2 +- .../model/operation/OperationTraitTest.kt | 2 +- 18 files changed, 15 insertions(+), 98 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/message/mqtt => bindings/mqtt/v0/_1_0/message}/MQTTMessageBindingTest.kt (84%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/operation/mqtt => bindings/mqtt/v0/_1_0/operation}/MQTTOperationBindingTest.kt (85%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/server/mqtt => bindings/mqtt/v0/_1_0/server}/MQTTServerBindingTest.kt (83%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt/MQTTServerBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt similarity index 84% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt index 8cfe6b1c..584f446e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/message/mqtt/MQTTMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.message.mqtt +package com.asyncapi.bindings.mqtt.v0._1_0.message import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding class MQTTMessageBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt similarity index 85% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt index 504b42cb..fb8971ac 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/mqtt/MQTTOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.operation.mqtt +package com.asyncapi.bindings.mqtt.v0._1_0.operation import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding class MQTTOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt/MQTTServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt similarity index 83% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt/MQTTServerBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt index cdac90e3..b58c58f9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt/MQTTServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt @@ -1,8 +1,6 @@ -package com.asyncapi.v3.binding.server.mqtt +package com.asyncapi.bindings.mqtt.v0._1_0.server import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding -import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index d2272a1a..1482e4a9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding -import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 731f88a0..5ba3cd3d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding -import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index d3256f4a..f4483b67 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding -import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 66cf911e..5b25f47b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding -import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index e1514ea1..e5cc196b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBin import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest -import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest class MessageTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 7719a864..8d818abf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBin import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest -import com.asyncapi.v2.binding.message.mqtt.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest class MessageTraitTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index a932f5fa..c7728338 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest -import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index fb9ebaa8..40d4fc12 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest -import com.asyncapi.v2.binding.operation.mqtt.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBindingTest.kt deleted file mode 100644 index 81c970f5..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/message/mqtt/MQTTMessageBindingTest.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.v2.binding.message.mqtt - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding - -class MQTTMessageBindingTest: SerDeTest() { - - override fun objectClass() = MQTTMessageBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/message/mqtt/mqttMessageBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/message/mqtt/mqttMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/message/mqtt/mqttMessageBinding - wrongly extended.json" - - override fun build(): MQTTMessageBinding { - return MQTTMessageBinding.builder() - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBindingTest.kt deleted file mode 100644 index 17cad2c6..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/mqtt/MQTTOperationBindingTest.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.asyncapi.v2.binding.operation.mqtt - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding - -class MQTTOperationBindingTest: SerDeTest() { - - override fun objectClass() = MQTTOperationBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/operation/mqtt/mqttOperationBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/operation/mqtt/mqttOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/operation/mqtt/mqttOperationBinding - wrongly extended.json" - - override fun build(): MQTTOperationBinding { - return MQTTOperationBinding.builder() - .qos(2) - .retain(true) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt/MQTTServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt/MQTTServerBindingTest.kt deleted file mode 100644 index 9dc23e49..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt/MQTTServerBindingTest.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.asyncapi.v2.binding.server.mqtt - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding -import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class MQTTServerBindingTest: SerDeTest() { - - override fun objectClass() = MQTTServerBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/server/mqtt/mqttServerBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/server/mqtt/mqttServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/server/mqtt/mqttServerBinding - wrongly extended.json" - - override fun build(): MQTTServerBinding { - return MQTTServerBinding.builder() - .clientId("guest") - .cleanSession(true) - .lastWill(MQTTServerLastWillConfiguration( - "/last-wills", - 2, - "Guest gone offline.", - false - )) - .keepAlive(60) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 8bfbf1cc..40b353fb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBin import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest -import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 336d757d..4e0a823c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBin import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest -import com.asyncapi.v3.binding.message.mqtt.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema class MessageTraitTestWithSchema: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index c26dfb20..332a5af4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest -import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.Reference diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 574bbbfc..c21ee2b6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest -import com.asyncapi.v3.binding.operation.mqtt.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.Reference From b5b8480706ba84703e5bfb345d0f88417a33d51e Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 15:17:54 +0400 Subject: [PATCH 031/141] test(bindings): NATS common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/176 --- .../operation}/NATSOperationBindingTest.kt | 3 +-- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../nats/NATSOperationBindingTest.kt | 22 ------------------- .../v3/_0_0/model/operation/OperationTest.kt | 2 +- .../model/operation/OperationTraitTest.kt | 2 +- 8 files changed, 7 insertions(+), 30 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/operation/nats => bindings/nats/v0/_1_0/operation}/NATSOperationBindingTest.kt (84%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/nats/NATSOperationBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/nats/NATSOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt similarity index 84% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/nats/NATSOperationBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt index 25ada9b2..b65ccd7a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/nats/NATSOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.operation.nats +package com.asyncapi.bindings.nats.v0._1_0.operation import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding class NATSOperationBindingTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index f4483b67..c6e28500 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding -import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 5b25f47b..94fe9ed7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding -import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index c7728338..f529c628 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest -import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest class OperationWithReferenceToMessageTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 40d4fc12..2309439a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest -import com.asyncapi.v2.binding.operation.nats.NATSOperationBindingTest +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest class OperationTraitTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/nats/NATSOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/nats/NATSOperationBindingTest.kt deleted file mode 100644 index 77cfa259..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/nats/NATSOperationBindingTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.asyncapi.v2.binding.operation.nats - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding - -class NATSOperationBindingTest: SerDeTest() { - - override fun objectClass() = NATSOperationBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/operation/nats/natsOperationBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/operation/nats/natsOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/operation/nats/natsOperationBinding - wrongly extended.json" - - override fun build(): NATSOperationBinding { - return NATSOperationBinding.builder() - .queue("messages") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 332a5af4..f850ece9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest -import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index c21ee2b6..54be0f01 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest -import com.asyncapi.v3.binding.operation.nats.NATSOperationBindingTest +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest From 8639cdae3762854f5de6a2f05ddd45ee9c002995 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 15:21:09 +0400 Subject: [PATCH 032/141] test(bindings): Solace common tests https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/180 --- .../operation}/SolaceOperationBindingTest.kt | 4 +- .../_3_0/server}/SolaceServerBindingTest.kt | 3 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 2 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../solace/SolaceOperationBindingTest.kt | 49 ------------------- .../server/solace/SolaceServerBindingTest.kt | 26 ---------- .../v3/_0_0/model/operation/OperationTest.kt | 2 +- .../model/operation/OperationTraitTest.kt | 2 +- 10 files changed, 8 insertions(+), 86 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/operation/solace => bindings/solace/v0/_3_0/operation}/SolaceOperationBindingTest.kt (91%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/server/solace => bindings/solace/v0/_3_0/server}/SolaceServerBindingTest.kt (86%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/solace/SolaceOperationBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/solace/SolaceServerBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/solace/SolaceOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt similarity index 91% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/solace/SolaceOperationBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt index 1ca91a22..bfe4845f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/operation/solace/SolaceOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt @@ -1,8 +1,6 @@ -package com.asyncapi.v3.binding.operation.solace +package com.asyncapi.bindings.solace.v0._3_0.operation import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationDestination import com.asyncapi.bindings.solace.v0._3_0.operation.queue.SolaceOperationQueue import com.asyncapi.bindings.solace.v0._3_0.operation.topic.SolaceOperationTopic diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/solace/SolaceServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt similarity index 86% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/solace/SolaceServerBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt index 3086de35..f382d060 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/solace/SolaceServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.server.solace +package com.asyncapi.bindings.solace.v0._3_0.server import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index c6e28500..a7865936 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding -import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 94fe9ed7..edaaf32c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding -import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index f529c628..91129647 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest -import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest class OperationWithReferenceToMessageTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 2309439a..93ad9962 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest -import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest class OperationTraitTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/solace/SolaceOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/solace/SolaceOperationBindingTest.kt deleted file mode 100644 index 283f2af7..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/operation/solace/SolaceOperationBindingTest.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.asyncapi.v2.binding.operation.solace - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationDestination -import com.asyncapi.bindings.solace.v0._3_0.operation.queue.SolaceOperationQueue -import com.asyncapi.bindings.solace.v0._3_0.operation.topic.SolaceOperationTopic - -class SolaceOperationBindingTest: SerDeTest() { - - override fun objectClass() = SolaceOperationBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/operation/solace/solaceOperationBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/operation/solace/solaceOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/operation/solace/solaceOperationBinding - wrongly extended.json" - - override fun build(): SolaceOperationBinding { - return SolaceOperationBinding.builder() - .destinations(listOf( - SolaceOperationDestination.builder() - .destinationType(SolaceOperationDestination.Type.QUEUE) - .queue(SolaceOperationQueue.builder() - .name("CreatedHREvents") - .topicSubscriptions(listOf("person/*/created")) - .accessType(SolaceOperationQueue.AccessType.EXCLUSIVE) - .maxMsgSpoolSize("1,500") - .maxTtl("60") - .build() - ) - .build(), - SolaceOperationDestination.builder() - .destinationType(SolaceOperationDestination.Type.QUEUE) - .queue(SolaceOperationQueue.builder() - .name("UpdatedHREvents") - .topicSubscriptions(listOf("person/*/updated")) - .build() - ) - .topic(SolaceOperationTopic.builder() - .topicSubscriptions(listOf("person/*/updated")) - .build() - ) - .build() - )) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/solace/SolaceServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/solace/SolaceServerBindingTest.kt deleted file mode 100644 index dcc14458..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/solace/SolaceServerBindingTest.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.asyncapi.v2.binding.server.solace - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class SolaceServerBindingTest: SerDeTest() { - - override fun objectClass() = SolaceServerBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/server/solace/solaceServerBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/server/solace/solaceServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/server/solace/solaceServerBinding - wrongly extended.json" - - override fun build(): SolaceServerBinding { - return SolaceServerBinding.builder() - .msgVpn("solace.private.net") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index f850ece9..94ff2dbd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest -import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 54be0f01..b477904e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest -import com.asyncapi.v3.binding.operation.solace.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation From e0a09b170cf3abab0158c1a945ecaa108b777ab8 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 16:40:44 +0400 Subject: [PATCH 033/141] test(bindings): Bindings common test resources https://github.com/asyncapi/jasyncapi/issues/184 --- .../bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt | 6 +++--- .../bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt | 6 +++--- .../amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt | 6 +++--- .../v0/_0_1/channel/AnypointMQChannelBindingTest.kt | 6 +++--- .../v0/_0_1/message/AnypointMQMessageBindingTest.kt | 6 +++--- .../v0/_1_0/channel/GooglePubSubChannelBindingTest.kt | 6 +++--- .../v0/_1_0/message/GooglePubSubMessageBindingTest.kt | 6 +++--- .../bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt | 6 +++--- .../http/v0/_1_0/operation/HTTPOperationBindingTest.kt | 6 +++--- .../ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt | 6 +++--- .../ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt | 6 +++--- .../bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt | 6 +++--- .../kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt | 6 +++--- .../kafka/v0/_4_0/message/KafkaMessageBindingTest.kt | 6 +++--- .../kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt | 6 +++--- .../bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt | 6 +++--- .../bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt | 6 +++--- .../mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt | 6 +++--- .../bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt | 6 +++--- .../nats/v0/_1_0/operation/NATSOperationBindingTest.kt | 6 +++--- .../pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt | 6 +++--- .../pulsar/v0/_1_0/server/PulsarServerBindingTest.kt | 6 +++--- .../solace/v0/_3_0/operation/SolaceOperationBindingTest.kt | 6 +++--- .../solace/v0/_3_0/server/SolaceServerBindingTest.kt | 6 +++--- .../v0/_1_0/channel/WebSocketsChannelBindingTest.kt | 6 +++--- .../v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt | 6 +++--- .../amqp/channel}/amqpChannelBinding - extended.json | 0 .../channel}/amqpChannelBinding - wrongly extended.json | 0 .../amqp => bindings/amqp/channel}/amqpChannelBinding.json | 0 .../amqp/message}/amqpMessageBinding - extended.json | 0 .../message}/amqpMessageBinding - wrongly extended.json | 0 .../amqp => bindings/amqp/message}/amqpMessageBinding.json | 0 .../amqp/operation}/amqpOperationBinding - extended.json | 0 .../operation}/amqpOperationBinding - wrongly extended.json | 0 .../amqp/operation}/amqpOperationBinding.json | 0 .../channel}/anypointMQChannelBinding - extended.json | 0 .../anypointMQChannelBinding - wrongly extended.json | 0 .../anypointmq/channel}/anypointMQChannelBinding.json | 0 .../message}/anypointMQMessageBinding - extended.json | 0 .../anypointMQMessageBinding - wrongly extended.json | 0 .../anypointmq/message}/anypointMQMessageBinding.json | 0 .../channel}/googlePubSubChannelBinding - extended.json | 0 .../googlePubSubChannelBinding - wrongly extended.json | 0 .../googlepubsub/channel}/googlePubSubChannelBinding.json | 0 .../message}/googlePubSubMessageBinding - extended.json | 0 .../googlePubSubMessageBinding - wrongly extended.json | 0 .../googlepubsub/message}/googlePubSubMessageBinding.json | 0 .../http/message}/httpMessageBinding - extended.json | 0 .../message}/httpMessageBinding - wrongly extended.json | 0 .../http => bindings/http/message}/httpMessageBinding.json | 0 .../http/operation}/httpOperationBinding - extended.json | 0 .../operation}/httpOperationBinding - wrongly extended.json | 0 .../http/operation}/httpOperationBinding.json | 0 .../ibmmq/channel}/ibmMQChannelBinding - extended.json | 0 .../channel}/ibmMQChannelBinding - wrongly extended.json | 0 .../ibmmq/channel}/ibmMQChannelBinding.json | 0 .../ibmmq/message}/ibmMQMessageBinding - extended.json | 0 .../message}/ibmMQMessageBinding - wrongly extended.json | 0 .../ibmmq/message}/ibmMQMessageBinding.json | 0 .../ibmmq/server}/ibmmqServerBinding - extended.json | 0 .../server}/ibmmqServerBinding - wrongly extended.json | 0 .../ibmmq => bindings/ibmmq/server}/ibmmqServerBinding.json | 0 .../kafka/channel}/kafkaChannelBinding - extended.json | 0 .../channel}/kafkaChannelBinding - wrongly extended.json | 0 .../kafka/channel}/kafkaChannelBinding.json | 0 .../kafka/message}/kafkaMessageBinding - extended.json | 0 .../message}/kafkaMessageBinding - wrongly extended.json | 0 .../kafka/message}/kafkaMessageBinding.json | 0 .../kafka/operation}/kafkaOperationBinding - extended.json | 0 .../kafkaOperationBinding - wrongly extended.json | 0 .../kafka/operation}/kafkaOperationBinding.json | 0 .../kafka/server}/kafkaServerBinding - extended.json | 0 .../server}/kafkaServerBinding - wrongly extended.json | 0 .../kafka => bindings/kafka/server}/kafkaServerBinding.json | 0 .../mqtt/message}/mqttMessageBinding - extended.json | 0 .../message}/mqttMessageBinding - wrongly extended.json | 0 .../mqtt => bindings/mqtt/message}/mqttMessageBinding.json | 0 .../mqtt/operation}/mqttOperationBinding - extended.json | 0 .../operation}/mqttOperationBinding - wrongly extended.json | 0 .../mqtt/operation}/mqttOperationBinding.json | 0 .../mqtt/server}/mqttServerBinding - extended.json | 0 .../mqtt/server}/mqttServerBinding - wrongly extended.json | 0 .../mqtt => bindings/mqtt/server}/mqttServerBinding.json | 0 .../mqtt5/server}/mqtt5ServerBinding - extended.json | 0 .../server}/mqtt5ServerBinding - wrongly extended.json | 0 .../mqtt5 => bindings/mqtt5/server}/mqtt5ServerBinding.json | 0 .../nats/operation}/natsOperationBinding - extended.json | 0 .../operation}/natsOperationBinding - wrongly extended.json | 0 .../nats/operation}/natsOperationBinding.json | 0 .../pulsar/channel}/pulsarChannelBinding - extended.json | 0 .../channel}/pulsarChannelBinding - wrongly extended.json | 0 .../pulsar/channel}/pulsarChannelBinding.json | 0 .../pulsar/server}/pulsarServerBinding - extended.json | 0 .../server}/pulsarServerBinding - wrongly extended.json | 0 .../pulsar/server}/pulsarServerBinding.json | 0 .../operation}/solaceOperationBinding - extended.json | 0 .../solaceOperationBinding - wrongly extended.json | 0 .../solace/operation}/solaceOperationBinding.json | 0 .../solace/server}/solaceServerBinding - extended.json | 0 .../server}/solaceServerBinding - wrongly extended.json | 0 .../solace/server}/solaceServerBinding.json | 0 .../channel}/webSocketsChannelBinding - extended.json | 0 .../webSocketsChannelBinding - wrongly extended.json | 0 .../websockets/channel}/webSocketsChannelBinding.json | 0 104 files changed, 78 insertions(+), 78 deletions(-) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/amqp => bindings/amqp/channel}/amqpChannelBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/amqp => bindings/amqp/channel}/amqpChannelBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/amqp => bindings/amqp/channel}/amqpChannelBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/amqp => bindings/amqp/message}/amqpMessageBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/amqp => bindings/amqp/message}/amqpMessageBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/amqp => bindings/amqp/message}/amqpMessageBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/amqp => bindings/amqp/operation}/amqpOperationBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/amqp => bindings/amqp/operation}/amqpOperationBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/amqp => bindings/amqp/operation}/amqpOperationBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/anypoint => bindings/anypointmq/channel}/anypointMQChannelBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/anypoint => bindings/anypointmq/channel}/anypointMQChannelBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/anypoint => bindings/anypointmq/channel}/anypointMQChannelBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/anypointmq => bindings/anypointmq/message}/anypointMQMessageBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/anypointmq => bindings/anypointmq/message}/anypointMQMessageBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/anypointmq => bindings/anypointmq/message}/anypointMQMessageBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/googlepubsub => bindings/googlepubsub/channel}/googlePubSubChannelBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/googlepubsub => bindings/googlepubsub/channel}/googlePubSubChannelBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/googlepubsub => bindings/googlepubsub/channel}/googlePubSubChannelBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/googlepubsub => bindings/googlepubsub/message}/googlePubSubMessageBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/googlepubsub => bindings/googlepubsub/message}/googlePubSubMessageBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/googlepubsub => bindings/googlepubsub/message}/googlePubSubMessageBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/http => bindings/http/message}/httpMessageBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/http => bindings/http/message}/httpMessageBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/http => bindings/http/message}/httpMessageBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/http => bindings/http/operation}/httpOperationBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/http => bindings/http/operation}/httpOperationBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/http => bindings/http/operation}/httpOperationBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/ibmmq => bindings/ibmmq/channel}/ibmMQChannelBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/ibmmq => bindings/ibmmq/channel}/ibmMQChannelBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/ibmmq => bindings/ibmmq/channel}/ibmMQChannelBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/ibmmq => bindings/ibmmq/message}/ibmMQMessageBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/ibmmq => bindings/ibmmq/message}/ibmMQMessageBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/ibmmq => bindings/ibmmq/message}/ibmMQMessageBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/ibmmq => bindings/ibmmq/server}/ibmmqServerBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/ibmmq => bindings/ibmmq/server}/ibmmqServerBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/ibmmq => bindings/ibmmq/server}/ibmmqServerBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/kafka => bindings/kafka/channel}/kafkaChannelBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/kafka => bindings/kafka/channel}/kafkaChannelBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/kafka => bindings/kafka/channel}/kafkaChannelBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/kafka => bindings/kafka/message}/kafkaMessageBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/kafka => bindings/kafka/message}/kafkaMessageBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/kafka => bindings/kafka/message}/kafkaMessageBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/kafka => bindings/kafka/operation}/kafkaOperationBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/kafka => bindings/kafka/operation}/kafkaOperationBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/kafka => bindings/kafka/operation}/kafkaOperationBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/kafka => bindings/kafka/server}/kafkaServerBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/kafka => bindings/kafka/server}/kafkaServerBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/kafka => bindings/kafka/server}/kafkaServerBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/mqtt => bindings/mqtt/message}/mqttMessageBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/mqtt => bindings/mqtt/message}/mqttMessageBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/message/mqtt => bindings/mqtt/message}/mqttMessageBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/mqtt => bindings/mqtt/operation}/mqttOperationBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/mqtt => bindings/mqtt/operation}/mqttOperationBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/mqtt => bindings/mqtt/operation}/mqttOperationBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/mqtt => bindings/mqtt/server}/mqttServerBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/mqtt => bindings/mqtt/server}/mqttServerBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/mqtt => bindings/mqtt/server}/mqttServerBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/mqtt5 => bindings/mqtt5/server}/mqtt5ServerBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/mqtt5 => bindings/mqtt5/server}/mqtt5ServerBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/mqtt5 => bindings/mqtt5/server}/mqtt5ServerBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/nats => bindings/nats/operation}/natsOperationBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/nats => bindings/nats/operation}/natsOperationBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/nats => bindings/nats/operation}/natsOperationBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/pulsar => bindings/pulsar/channel}/pulsarChannelBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/pulsar => bindings/pulsar/channel}/pulsarChannelBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/pulsar => bindings/pulsar/channel}/pulsarChannelBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/pulsar => bindings/pulsar/server}/pulsarServerBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/pulsar => bindings/pulsar/server}/pulsarServerBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/pulsar => bindings/pulsar/server}/pulsarServerBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/solace => bindings/solace/operation}/solaceOperationBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/solace => bindings/solace/operation}/solaceOperationBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/operation/solace => bindings/solace/operation}/solaceOperationBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/solace => bindings/solace/server}/solaceServerBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/solace => bindings/solace/server}/solaceServerBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/server/solace => bindings/solace/server}/solaceServerBinding.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/ws => bindings/websockets/channel}/webSocketsChannelBinding - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/ws => bindings/websockets/channel}/webSocketsChannelBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/binding/channel/ws => bindings/websockets/channel}/webSocketsChannelBinding.json (100%) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt index 00dfd1e6..26396c43 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt @@ -13,11 +13,11 @@ class AMQPChannelBindingTest: SerDeTest() { override fun objectClass() = AMQPChannelBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/channel/amqp/amqpChannelBinding.json" + override fun baseObjectJson() = "/bindings/amqp/channel/amqpChannelBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/channel/amqp/amqpChannelBinding - extended.json" + override fun extendedObjectJson() = "/bindings/amqp/channel/amqpChannelBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/channel/amqp/amqpChannelBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/amqp/channel/amqpChannelBinding - wrongly extended.json" override fun build(): AMQPChannelBinding { return AMQPChannelBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt index 6c786583..2191fe00 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt @@ -6,11 +6,11 @@ class AMQPMessageBindingTest: SerDeTest() { override fun objectClass() = AMQPMessageBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/message/amqp/amqpMessageBinding.json" + override fun baseObjectJson() = "/bindings/amqp/message/amqpMessageBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/message/amqp/amqpMessageBinding - extended.json" + override fun extendedObjectJson() = "/bindings/amqp/message/amqpMessageBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/message/amqp/amqpMessageBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/amqp/message/amqpMessageBinding - wrongly extended.json" override fun build(): AMQPMessageBinding { return AMQPMessageBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt index 47d63ead..356e0a0c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt @@ -6,11 +6,11 @@ class AMQPOperationBindingTest: SerDeTest() { override fun objectClass() = AMQPOperationBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/operation/amqp/amqpOperationBinding.json" + override fun baseObjectJson() = "/bindings/amqp/operation/amqpOperationBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/operation/amqp/amqpOperationBinding - extended.json" + override fun extendedObjectJson() = "/bindings/amqp/operation/amqpOperationBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/operation/amqp/amqpOperationBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/amqp/operation/amqpOperationBinding - wrongly extended.json" override fun build(): AMQPOperationBinding { return AMQPOperationBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt index 95888eec..e1f53a75 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt @@ -10,11 +10,11 @@ class AnypointMQChannelBindingTest: SerDeTest() { override fun objectClass() = AnypointMQChannelBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/channel/anypoint/anypointMQChannelBinding.json" + override fun baseObjectJson() = "/bindings/anypointmq/channel/anypointMQChannelBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/channel/anypoint/anypointMQChannelBinding - extended.json" + override fun extendedObjectJson() = "/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/channel/anypoint/anypointMQChannelBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/anypointmq/channel/anypointMQChannelBinding - wrongly extended.json" override fun build(): AnypointMQChannelBinding { return AnypointMQChannelBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt index 67661143..476f316c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt @@ -8,11 +8,11 @@ class AnypointMQMessageBindingTest: SerDeTest() { override fun objectClass() = AnypointMQMessageBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/message/anypointmq/anypointMQMessageBinding.json" + override fun baseObjectJson() = "/bindings/anypointmq/message/anypointMQMessageBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/message/anypointmq/anypointMQMessageBinding - extended.json" + override fun extendedObjectJson() = "/bindings/anypointmq/message/anypointMQMessageBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/message/anypointmq/anypointMQMessageBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/anypointmq/message/anypointMQMessageBinding - wrongly extended.json" override fun build(): AnypointMQMessageBinding { return AnypointMQMessageBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt index e9859c65..c956668e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt @@ -6,11 +6,11 @@ class GooglePubSubChannelBindingTest: SerDeTest() { override fun objectClass() = GooglePubSubChannelBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/channel/googlepubsub/googlePubSubChannelBinding.json" + override fun baseObjectJson() = "/bindings/googlepubsub/channel/googlePubSubChannelBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/channel/googlepubsub/googlePubSubChannelBinding - extended.json" + override fun extendedObjectJson() = "/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/channel/googlepubsub/googlePubSubChannelBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/googlepubsub/channel/googlePubSubChannelBinding - wrongly extended.json" override fun build(): GooglePubSubChannelBinding { return GooglePubSubChannelBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt index 953fb339..a7063cf1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt @@ -6,11 +6,11 @@ class GooglePubSubMessageBindingTest: SerDeTest() { override fun objectClass() = GooglePubSubMessageBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/message/googlepubsub/googlePubSubMessageBinding.json" + override fun baseObjectJson() = "/bindings/googlepubsub/message/googlePubSubMessageBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/message/googlepubsub/googlePubSubMessageBinding - extended.json" + override fun extendedObjectJson() = "/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/message/googlepubsub/googlePubSubMessageBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/googlepubsub/message/googlePubSubMessageBinding - wrongly extended.json" override fun build(): GooglePubSubMessageBinding { return GooglePubSubMessageBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt index 75bd878b..9a2bcb3b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt @@ -8,11 +8,11 @@ class HTTPMessageBindingTest: SerDeTest() { override fun objectClass() = HTTPMessageBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/message/http/httpMessageBinding.json" + override fun baseObjectJson() = "/bindings/http/message/httpMessageBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/message/http/httpMessageBinding - extended.json" + override fun extendedObjectJson() = "/bindings/http/message/httpMessageBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/message/http/httpMessageBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/http/message/httpMessageBinding - wrongly extended.json" override fun build(): HTTPMessageBinding { return HTTPMessageBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt index f3682742..3823cf6d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt @@ -9,11 +9,11 @@ class HTTPOperationBindingTest: SerDeTest() { override fun objectClass() = HTTPOperationBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/operation/http/httpOperationBinding.json" + override fun baseObjectJson() = "/bindings/http/operation/httpOperationBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/operation/http/httpOperationBinding - extended.json" + override fun extendedObjectJson() = "/bindings/http/operation/httpOperationBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/operation/http/httpOperationBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/http/operation/httpOperationBinding - wrongly extended.json" override fun build(): HTTPOperationBinding { return HTTPOperationBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt index 0e839f24..87cc443e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt @@ -6,11 +6,11 @@ class IBMMQChannelBindingTest: SerDeTest() { override fun objectClass() = IBMMQChannelBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/channel/ibmmq/ibmMQChannelBinding.json" + override fun baseObjectJson() = "/bindings/ibmmq/channel/ibmMQChannelBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/channel/ibmmq/ibmMQChannelBinding - extended.json" + override fun extendedObjectJson() = "/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/channel/ibmmq/ibmMQChannelBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/ibmmq/channel/ibmMQChannelBinding - wrongly extended.json" override fun build(): IBMMQChannelBinding { return IBMMQChannelBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt index bf0e2b95..54356285 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt @@ -6,11 +6,11 @@ class IBMMQMessageBindingTest: SerDeTest() { override fun objectClass() = IBMMQMessageBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/message/ibmmq/ibmMQMessageBinding.json" + override fun baseObjectJson() = "/bindings/ibmmq/message/ibmMQMessageBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/message/ibmmq/ibmMQMessageBinding - extended.json" + override fun extendedObjectJson() = "/bindings/ibmmq/message/ibmMQMessageBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/message/ibmmq/ibmMQMessageBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/ibmmq/message/ibmMQMessageBinding - wrongly extended.json" override fun build(): IBMMQMessageBinding { return IBMMQMessageBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt index 515a7201..b5fb9f5f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt @@ -10,11 +10,11 @@ class IBMMQServerBindingTest: SerDeTest() { override fun objectClass() = IBMMQServerBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/server/ibmmq/ibmmqServerBinding.json" + override fun baseObjectJson() = "/bindings/ibmmq/server/ibmmqServerBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/server/ibmmq/ibmmqServerBinding - extended.json" + override fun extendedObjectJson() = "/bindings/ibmmq/server/ibmmqServerBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/server/ibmmq/ibmmqServerBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/ibmmq/server/ibmmqServerBinding - wrongly extended.json" override fun build(): IBMMQServerBinding { return IBMMQServerBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt index 1d5e8fa6..cd3f1226 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt @@ -10,11 +10,11 @@ class KafkaChannelBindingTest: SerDeTest() { override fun objectClass() = KafkaChannelBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/channel/kafka/kafkaChannelBinding.json" + override fun baseObjectJson() = "/bindings/kafka/channel/kafkaChannelBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/channel/kafka/kafkaChannelBinding - extended.json" + override fun extendedObjectJson() = "/bindings/kafka/channel/kafkaChannelBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/channel/kafka/kafkaChannelBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/kafka/channel/kafkaChannelBinding - wrongly extended.json" override fun build(): KafkaChannelBinding { return KafkaChannelBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt index 0b33875c..aa85b32f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt @@ -8,11 +8,11 @@ class KafkaMessageBindingTest: SerDeTest() { override fun objectClass() = KafkaMessageBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/message/kafka/kafkaMessageBinding.json" + override fun baseObjectJson() = "/bindings/kafka/message/kafkaMessageBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/message/kafka/kafkaMessageBinding - extended.json" + override fun extendedObjectJson() = "/bindings/kafka/message/kafkaMessageBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/message/kafka/kafkaMessageBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/kafka/message/kafkaMessageBinding - wrongly extended.json" override fun build(): KafkaMessageBinding { return KafkaMessageBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt index bdb7f8ce..9051f184 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt @@ -8,11 +8,11 @@ class KafkaOperationBindingTest: SerDeTest() { override fun objectClass() = KafkaOperationBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/operation/kafka/kafkaOperationBinding.json" + override fun baseObjectJson() = "/bindings/kafka/operation/kafkaOperationBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/operation/kafka/kafkaOperationBinding - extended.json" + override fun extendedObjectJson() = "/bindings/kafka/operation/kafkaOperationBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/operation/kafka/kafkaOperationBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/kafka/operation/kafkaOperationBinding - wrongly extended.json" override fun build(): KafkaOperationBinding { return KafkaOperationBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt index f946e82b..1b14c86c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt @@ -10,11 +10,11 @@ class KafkaServerBindingTest: SerDeTest() { override fun objectClass() = KafkaServerBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/server/kafka/kafkaServerBinding.json" + override fun baseObjectJson() = "/bindings/kafka/server/kafkaServerBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/server/kafka/kafkaServerBinding - extended.json" + override fun extendedObjectJson() = "/bindings/kafka/server/kafkaServerBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/server/kafka/kafkaServerBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/kafka/server/kafkaServerBinding - wrongly extended.json" override fun build(): KafkaServerBinding { return KafkaServerBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt index 584f446e..b2c9f47a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt @@ -6,11 +6,11 @@ class MQTTMessageBindingTest: SerDeTest() { override fun objectClass() = MQTTMessageBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/message/mqtt/mqttMessageBinding.json" + override fun baseObjectJson() = "/bindings/mqtt/message/mqttMessageBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/message/mqtt/mqttMessageBinding - extended.json" + override fun extendedObjectJson() = "/bindings/mqtt/message/mqttMessageBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/message/mqtt/mqttMessageBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/mqtt/message/mqttMessageBinding - wrongly extended.json" override fun build(): MQTTMessageBinding { return MQTTMessageBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt index fb8971ac..a3a71ac9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt @@ -6,11 +6,11 @@ class MQTTOperationBindingTest: SerDeTest() { override fun objectClass() = MQTTOperationBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/operation/mqtt/mqttOperationBinding.json" + override fun baseObjectJson() = "/bindings/mqtt/operation/mqttOperationBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/operation/mqtt/mqttOperationBinding - extended.json" + override fun extendedObjectJson() = "/bindings/mqtt/operation/mqttOperationBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/operation/mqtt/mqttOperationBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/mqtt/operation/mqttOperationBinding - wrongly extended.json" override fun build(): MQTTOperationBinding { return MQTTOperationBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt index b58c58f9..9c37f5d5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt @@ -10,11 +10,11 @@ class MQTTServerBindingTest: SerDeTest() { override fun objectClass() = MQTTServerBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/server/mqtt/mqttServerBinding.json" + override fun baseObjectJson() = "/bindings/mqtt/server/mqttServerBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/server/mqtt/mqttServerBinding - extended.json" + override fun extendedObjectJson() = "/bindings/mqtt/server/mqttServerBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/server/mqtt/mqttServerBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/mqtt/server/mqttServerBinding - wrongly extended.json" override fun build(): MQTTServerBinding { return MQTTServerBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt index b65ccd7a..b2fdfd18 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt @@ -6,11 +6,11 @@ class NATSOperationBindingTest: SerDeTest() { override fun objectClass() = NATSOperationBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/operation/nats/natsOperationBinding.json" + override fun baseObjectJson() = "/bindings/nats/operation/natsOperationBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/operation/nats/natsOperationBinding - extended.json" + override fun extendedObjectJson() = "/bindings/nats/operation/natsOperationBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/operation/nats/natsOperationBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/nats/operation/natsOperationBinding - wrongly extended.json" override fun build(): NATSOperationBinding { return NATSOperationBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt index f061926c..5b8e1744 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt @@ -6,11 +6,11 @@ class PulsarChannelBindingTest: SerDeTest() { override fun objectClass() = PulsarChannelBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/channel/pulsar/pulsarChannelBinding.json" + override fun baseObjectJson() = "/bindings/pulsar/channel/pulsarChannelBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/channel/pulsar/pulsarChannelBinding - extended.json" + override fun extendedObjectJson() = "/bindings/pulsar/channel/pulsarChannelBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/channel/pulsar/pulsarChannelBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/pulsar/channel/pulsarChannelBinding - wrongly extended.json" override fun build(): PulsarChannelBinding { return PulsarChannelBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt index 760591fe..7a572e43 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt @@ -10,11 +10,11 @@ class PulsarServerBindingTest: SerDeTest() { override fun objectClass() = PulsarServerBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/server/pulsar/pulsarServerBinding.json" + override fun baseObjectJson() = "/bindings/pulsar/server/pulsarServerBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/server/pulsar/pulsarServerBinding - extended.json" + override fun extendedObjectJson() = "/bindings/pulsar/server/pulsarServerBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/server/pulsar/pulsarServerBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/pulsar/server/pulsarServerBinding - wrongly extended.json" override fun build(): PulsarServerBinding { return PulsarServerBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt index bfe4845f..b3dbb7ed 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt @@ -8,11 +8,11 @@ class SolaceOperationBindingTest: SerDeTest() { override fun objectClass() = SolaceOperationBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/operation/solace/solaceOperationBinding.json" + override fun baseObjectJson() = "/bindings/solace/operation/solaceOperationBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/operation/solace/solaceOperationBinding - extended.json" + override fun extendedObjectJson() = "/bindings/solace/operation/solaceOperationBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/operation/solace/solaceOperationBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/solace/operation/solaceOperationBinding - wrongly extended.json" override fun build(): SolaceOperationBinding { return SolaceOperationBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt index f382d060..37e192c0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt @@ -10,11 +10,11 @@ class SolaceServerBindingTest: SerDeTest() { override fun objectClass() = SolaceServerBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/server/solace/solaceServerBinding.json" + override fun baseObjectJson() = "/bindings/solace/server/solaceServerBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/server/solace/solaceServerBinding - extended.json" + override fun extendedObjectJson() = "/bindings/solace/server/solaceServerBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/server/solace/solaceServerBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/solace/server/solaceServerBinding - wrongly extended.json" override fun build(): SolaceServerBinding { return SolaceServerBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt index bfca679f..83966ce4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt @@ -13,11 +13,11 @@ class WebSocketsChannelBindingTest: SerDeTest() { override fun objectClass() = WebSocketsChannelBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/channel/ws/webSocketsChannelBinding.json" + override fun baseObjectJson() = "/bindings/websockets/channel/webSocketsChannelBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/channel/ws/webSocketsChannelBinding - extended.json" + override fun extendedObjectJson() = "/bindings/websockets/channel/webSocketsChannelBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/channel/ws/webSocketsChannelBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/websockets/channel/webSocketsChannelBinding - wrongly extended.json" override fun build(): WebSocketsChannelBinding { return WebSocketsChannelBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt index f5595928..83d8370b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt @@ -11,11 +11,11 @@ class MQTT5ServerBindingTest: SerDeTest() { override fun objectClass() = MQTT5ServerBinding::class.java - override fun baseObjectJson() = "/json/v3/binding/server/mqtt5/mqtt5ServerBinding.json" + override fun baseObjectJson() = "/bindings/mqtt5/server/mqtt5ServerBinding.json" - override fun extendedObjectJson() = "/json/v3/binding/server/mqtt5/mqtt5ServerBinding - extended.json" + override fun extendedObjectJson() = "/bindings/mqtt5/server/mqtt5ServerBinding - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/binding/server/mqtt5/mqtt5ServerBinding - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/bindings/mqtt5/server/mqtt5ServerBinding - wrongly extended.json" override fun build(): MQTT5ServerBinding { return MQTT5ServerBinding.builder() diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/amqp/amqpChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/amqp/amqpChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/amqp/amqpChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/amqp/amqpChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/amqp/amqpChannelBinding.json b/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/amqp/amqpChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/amqp/amqpMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/amqp/amqpMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/amqp/amqpMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/amqp/amqpMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/amqp/amqpMessageBinding.json b/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/amqp/amqpMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/amqp/amqpOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/amqp/amqpOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/amqp/amqpOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/amqp/amqpOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/amqp/amqpOperationBinding.json b/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/amqp/amqpOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/anypoint/anypointMQChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/anypoint/anypointMQChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/anypoint/anypointMQChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/anypoint/anypointMQChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/anypoint/anypointMQChannelBinding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/anypoint/anypointMQChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/anypointmq/anypointMQMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/anypointmq/anypointMQMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/anypointmq/anypointMQMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/anypointmq/anypointMQMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/anypointmq/anypointMQMessageBinding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/anypointmq/anypointMQMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/googlepubsub/googlePubSubChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/googlepubsub/googlePubSubChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/googlepubsub/googlePubSubChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/googlepubsub/googlePubSubChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/googlepubsub/googlePubSubChannelBinding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/googlepubsub/googlePubSubChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/googlepubsub/googlePubSubMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/googlepubsub/googlePubSubMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/googlepubsub/googlePubSubMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/googlepubsub/googlePubSubMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/googlepubsub/googlePubSubMessageBinding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/googlepubsub/googlePubSubMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/http/httpMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/http/httpMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/http/httpMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/http/httpMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/http/httpMessageBinding.json b/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/http/httpMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/http/httpOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/http/httpOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/http/httpOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/http/httpOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/http/httpOperationBinding.json b/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/http/httpOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/ibmmq/ibmMQChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/ibmmq/ibmMQChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/ibmmq/ibmMQChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/ibmmq/ibmMQChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/ibmmq/ibmMQChannelBinding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/ibmmq/ibmMQChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/ibmmq/ibmMQMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/ibmmq/ibmMQMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/ibmmq/ibmMQMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/ibmmq/ibmMQMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/ibmmq/ibmMQMessageBinding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/ibmmq/ibmMQMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/ibmmq/ibmmqServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/ibmmq/ibmmqServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/ibmmq/ibmmqServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/ibmmq/ibmmqServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/ibmmq/ibmmqServerBinding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/ibmmq/ibmmqServerBinding.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/kafka/kafkaChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/kafka/kafkaChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/kafka/kafkaChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/kafka/kafkaChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/kafka/kafkaChannelBinding.json b/asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/kafka/kafkaChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/kafka/kafkaMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/kafka/kafkaMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/kafka/kafkaMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/kafka/kafkaMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/kafka/kafkaMessageBinding.json b/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/kafka/kafkaMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/kafka/kafkaOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/kafka/kafkaOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/kafka/kafkaOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/kafka/kafkaOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/kafka/kafkaOperationBinding.json b/asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/kafka/kafkaOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/kafka/kafkaServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/kafka/kafkaServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/kafka/kafkaServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/kafka/kafkaServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/kafka/kafkaServerBinding.json b/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/kafka/kafkaServerBinding.json rename to asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/mqtt/mqttMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/mqtt/mqttMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/mqtt/mqttMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/mqtt/mqttMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/message/mqtt/mqttMessageBinding.json b/asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/message/mqtt/mqttMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/mqtt/mqttOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/mqtt/mqttOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/mqtt/mqttOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/mqtt/mqttOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/mqtt/mqttOperationBinding.json b/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/mqtt/mqttOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/mqtt/mqttServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/mqtt/mqttServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/mqtt/mqttServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/mqtt/mqttServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/mqtt/mqttServerBinding.json b/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/mqtt/mqttServerBinding.json rename to asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/mqtt5/mqtt5ServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/mqtt5/mqtt5ServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/mqtt5/mqtt5ServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/mqtt5/mqtt5ServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/mqtt5/mqtt5ServerBinding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/mqtt5/mqtt5ServerBinding.json rename to asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/nats/natsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/nats/natsOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/nats/natsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/nats/natsOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/nats/natsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/nats/natsOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/pulsar/pulsarChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/pulsar/pulsarChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/pulsar/pulsarChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/pulsar/pulsarChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/pulsar/pulsarChannelBinding.json b/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/pulsar/pulsarChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/pulsar/pulsarServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/pulsar/pulsarServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/pulsar/pulsarServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/pulsar/pulsarServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/pulsar/pulsarServerBinding.json b/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/pulsar/pulsarServerBinding.json rename to asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/solace/solaceOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/solace/solaceOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/solace/solaceOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/solace/solaceOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/operation/solace/solaceOperationBinding.json b/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/operation/solace/solaceOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/solace/solaceServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/solace/solaceServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/solace/solaceServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/solace/solaceServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/server/solace/solaceServerBinding.json b/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/server/solace/solaceServerBinding.json rename to asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/ws/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/ws/webSocketsChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/ws/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/ws/webSocketsChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/binding/channel/ws/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/binding/channel/ws/webSocketsChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding.json From 4de37ef850147ff1ff895eb3354925f456641479 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 16:42:30 +0400 Subject: [PATCH 034/141] test(bindings): MQTT5 common tests https://github.com/asyncapi/jasyncapi/issues/184 --- .../v0/_2_0/server}/MQTT5ServerBindingTest.kt | 3 +-- .../server/mqtt5/MQTT5ServerBindingTest.kt | 26 ------------------- 2 files changed, 1 insertion(+), 28 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/binding/server/mqtt5 => bindings/mqtt5/v0/_2_0/server}/MQTT5ServerBindingTest.kt (85%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBindingTest.kt diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBindingTest.kt similarity index 85% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBindingTest.kt index 83d8370b..d0251ec9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/binding/server/mqtt5/MQTT5ServerBindingTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBindingTest.kt @@ -1,7 +1,6 @@ -package com.asyncapi.v3.binding.server.mqtt5 +package com.asyncapi.bindings.mqtt5.v0._2_0.server import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBindingTest.kt deleted file mode 100644 index 8a51dc8f..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/binding/server/mqtt5/MQTT5ServerBindingTest.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.asyncapi.v2.binding.server.mqtt5 - -import com.asyncapi.v2.SerDeTest -import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding - -/** - * @version 2.6.0 - * @author Pavel Bodiachevskii - */ -class MQTT5ServerBindingTest: SerDeTest() { - - override fun objectClass() = MQTT5ServerBinding::class.java - - override fun baseObjectJson() = "/json/v2/binding/server/mqtt5/mqtt5ServerBinding.json" - - override fun extendedObjectJson() = "/json/v2/binding/server/mqtt5/mqtt5ServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v2/binding/server/mqtt5/mqtt5ServerBinding - wrongly extended.json" - - override fun build(): MQTT5ServerBinding { - return MQTT5ServerBinding.builder() - .sessionExpiryInterval(60) - .build() - } - -} \ No newline at end of file From ce0f3aaac5d81b1c2e20b11907f2881646cc7c3c Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 16:43:43 +0400 Subject: [PATCH 035/141] test(bindings): delete unused resources https://github.com/asyncapi/jasyncapi/issues/184 --- .../amqp/amqpChannelBinding - extended.json | 23 -- ...amqpChannelBinding - wrongly extended.json | 24 -- .../channel/amqp/amqpChannelBinding.json | 18 -- .../anypointMQChannelBinding - extended.json | 10 - ...ntMQChannelBinding - wrongly extended.json | 11 - .../anypoint/anypointMQChannelBinding.json | 5 - ...googlePubSubChannelBinding - extended.json | 20 -- ...bSubChannelBinding - wrongly extended.json | 30 --- .../googlePubSubChannelBinding.json | 24 -- .../ibmmq/ibmMQChannelBinding - extended.json | 21 -- ...bmMQChannelBinding - wrongly extended.json | 22 -- .../channel/ibmmq/ibmMQChannelBinding.json | 16 -- .../kafka/kafkaChannelBinding - extended.json | 18 -- ...afkaChannelBinding - wrongly extended.json | 22 -- .../channel/kafka/kafkaChannelBinding.json | 16 -- .../pulsarChannelBinding - extended.json | 18 -- ...lsarChannelBinding - wrongly extended.json | 22 -- .../channel/pulsar/pulsarChannelBinding.json | 16 -- .../webSocketsChannelBinding - extended.json | 215 ------------------ ...ketsChannelBinding - wrongly extended.json | 27 --- .../channel/ws/webSocketsChannelBinding.json | 21 -- .../amqp/amqpMessageBinding - extended.json | 10 - ...amqpMessageBinding - wrongly extended.json | 11 - .../message/amqp/amqpMessageBinding.json | 5 - .../anypointMQMessageBinding - extended.json | 111 --------- ...ntMQMessageBinding - wrongly extended.json | 18 -- .../anypointmq/anypointMQMessageBinding.json | 12 - ...googlePubSubMessageBinding - extended.json | 14 -- ...bSubMessageBinding - wrongly extended.json | 13 -- .../googlePubSubMessageBinding.json | 7 - .../http/httpMessageBinding - extended.json | 111 --------- ...httpMessageBinding - wrongly extended.json | 20 -- .../message/http/httpMessageBinding.json | 14 -- .../ibmmq/ibmMQMessageBinding - extended.json | 12 - ...bmMQMessageBinding - wrongly extended.json | 13 -- .../message/ibmmq/ibmMQMessageBinding.json | 7 - .../kafka/kafkaMessageBinding - extended.json | 62 ----- ...afkaMessageBinding - wrongly extended.json | 18 -- .../message/kafka/kafkaMessageBinding.json | 12 - .../mqtt/mqttMessageBinding - extended.json | 8 - ...mqttMessageBinding - wrongly extended.json | 9 - .../message/mqtt/mqttMessageBinding.json | 3 - .../amqp/amqpOperationBinding - extended.json | 18 -- ...qpOperationBinding - wrongly extended.json | 23 -- .../operation/amqp/amqpOperationBinding.json | 17 -- .../http/httpOperationBinding - extended.json | 113 --------- ...tpOperationBinding - wrongly extended.json | 25 -- .../operation/http/httpOperationBinding.json | 19 -- .../kafkaOperationBinding - extended.json | 110 --------- ...kaOperationBinding - wrongly extended.json | 21 -- .../kafka/kafkaOperationBinding.json | 15 -- .../mqtt/mqttOperationBinding - extended.json | 10 - ...ttOperationBinding - wrongly extended.json | 11 - .../operation/mqtt/mqttOperationBinding.json | 5 - .../nats/natsOperationBinding - extended.json | 9 - ...tsOperationBinding - wrongly extended.json | 10 - .../operation/nats/natsOperationBinding.json | 4 - .../solaceOperationBinding - extended.json | 33 --- ...ceOperationBinding - wrongly extended.json | 37 --- .../solace/solaceOperationBinding.json | 31 --- .../ibmmq/ibmmqServerBinding - extended.json | 13 -- ...ibmmqServerBinding - wrongly extended.json | 14 -- .../server/ibmmq/ibmmqServerBinding.json | 8 - .../kafka/kafkaServerBinding - extended.json | 10 - ...kafkaServerBinding - wrongly extended.json | 11 - .../server/kafka/kafkaServerBinding.json | 5 - .../mqtt/mqttServerBinding - extended.json | 17 -- .../mqttServerBinding - wrongly extended.json | 18 -- .../server/mqtt/mqttServerBinding.json | 12 - .../mqtt5/mqtt5ServerBinding - extended.json | 9 - ...mqtt5ServerBinding - wrongly extended.json | 10 - .../server/mqtt5/mqtt5ServerBinding.json | 4 - .../pulsarServerBinding - extended.json | 9 - ...ulsarServerBinding - wrongly extended.json | 10 - .../server/pulsar/pulsarServerBinding.json | 4 - .../solaceServerBinding - extended.json | 9 - ...olaceServerBinding - wrongly extended.json | 10 - .../server/solace/solaceServerBinding.json | 4 - 78 files changed, 1777 deletions(-) delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding - extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding.json diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding - extended.json deleted file mode 100644 index 61ef0ad3..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding - extended.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "is" : "routingKey", - "exchange" : { - "name" : "myExchange", - "type" : "topic", - "durable" : true, - "autoDelete" : false, - "vhost" : "/" - }, - "queue" : { - "name" : "my-queue-name", - "durable" : true, - "exclusive" : true, - "autoDelete" : false, - "vhost" : "/" - }, - "bindingVersion" : "0.2.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding - wrongly extended.json deleted file mode 100644 index a6433eb4..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding - wrongly extended.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "is": "routingKey", - "queue": { - "name": "my-queue-name", - "durable": true, - "exclusive": true, - "autoDelete": false, - "vhost": "/" - }, - "exchange": { - "name": "myExchange", - "type": "topic", - "durable": true, - "autoDelete": false, - "vhost": "/" - }, - "bindingVersion": "0.2.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding.json deleted file mode 100644 index e91cacb2..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/amqp/amqpChannelBinding.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "is": "routingKey", - "queue": { - "name": "my-queue-name", - "durable": true, - "exclusive": true, - "autoDelete": false, - "vhost": "/" - }, - "exchange": { - "name": "myExchange", - "type": "topic", - "durable": true, - "autoDelete": false, - "vhost": "/" - }, - "bindingVersion": "0.2.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding - extended.json deleted file mode 100644 index 4a27096c..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding - extended.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding - wrongly extended.json deleted file mode 100644 index 2b92a333..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding - wrongly extended.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "destination": "user-signup-exchg", - "destinationType": "exchange", - "bindingVersion": "0.0.1", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding.json deleted file mode 100644 index c5d7598b..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/anypoint/anypointMQChannelBinding.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "destination": "user-signup-exchg", - "destinationType": "exchange", - "bindingVersion": "0.0.1" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - extended.json deleted file mode 100644 index 560f8293..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - extended.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, - "messageRetentionDuration" : "86400s", - "messageStoragePolicy" : { - "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] - }, - "schemaSettings" : { - "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, - "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - wrongly extended.json deleted file mode 100644 index 374dbd31..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding - wrongly extended.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "topic": "projects/your-project/topics/topic-proto-schema", - "messageRetentionDuration": "86400s", - "messageStoragePolicy": { - "allowedPersistenceRegions": [ - "us-central1", - "us-central2", - "us-east1", - "us-east4", - "us-east5", - "us-east7", - "us-south1", - "us-west1", - "us-west2", - "us-west3", - "us-west4" - ] - }, - "schemaSettings": { - "encoding": "binary", - "name": "projects/your-project/schemas/message-proto" - }, - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding.json deleted file mode 100644 index fb9b3d3e..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/googlepubsub/googlePubSubChannelBinding.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "topic": "projects/your-project/topics/topic-proto-schema", - "messageRetentionDuration": "86400s", - "messageStoragePolicy": { - "allowedPersistenceRegions": [ - "us-central1", - "us-central2", - "us-east1", - "us-east4", - "us-east5", - "us-east7", - "us-south1", - "us-west1", - "us-west2", - "us-west3", - "us-west4" - ] - }, - "schemaSettings": { - "encoding": "binary", - "name": "projects/your-project/schemas/message-proto" - }, - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - extended.json deleted file mode 100644 index a0f4e987..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - extended.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "destinationType" : "topic", - "queue" : { - "objectName" : "message", - "isPartitioned" : false, - "exclusive" : true - }, - "topic" : { - "string" : "messages", - "objectName" : "message", - "durablePermitted" : true, - "lastMsgRetained" : true - }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - wrongly extended.json deleted file mode 100644 index deff6b3f..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding - wrongly extended.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "destinationType": "topic", - "queue": { - "objectName": "message", - "isPartitioned": false, - "exclusive": true - }, - "topic": { - "string": "messages", - "objectName": "message", - "durablePermitted": true, - "lastMsgRetained": true - }, - "maxMsgLength": 1024, - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding.json deleted file mode 100644 index 7ebdae40..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/ibmmq/ibmMQChannelBinding.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "destinationType": "topic", - "queue": { - "objectName": "message", - "isPartitioned": false, - "exclusive": true - }, - "topic": { - "string": "messages", - "objectName": "message", - "durablePermitted": true, - "lastMsgRetained": true - }, - "maxMsgLength": 1024, - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding - extended.json deleted file mode 100644 index 1b79a719..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding - extended.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "bindingVersion" : "0.4.0", - "topic" : "my-specific-topic-name", - "partitions" : 20, - "replicas" : 3, - "topicConfiguration" : { - "cleanup.policy" : [ "delete", "compact" ], - "retention.ms" : 604800000, - "retention.bytes" : 1000000000, - "delete.retention.ms" : 86400000, - "max.message.bytes" : 1048588 - }, - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding - wrongly extended.json deleted file mode 100644 index 8373d9c4..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding - wrongly extended.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "topic": "my-specific-topic-name", - "partitions": 20, - "replicas": 3, - "topicConfiguration": { - "cleanup.policy": [ - "delete", - "compact" - ], - "retention.ms": 604800000, - "retention.bytes": 1000000000, - "delete.retention.ms": 86400000, - "max.message.bytes": 1048588 - }, - "bindingVersion": "0.4.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding.json deleted file mode 100644 index c937ae56..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/kafka/kafkaChannelBinding.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "topic": "my-specific-topic-name", - "partitions": 20, - "replicas": 3, - "topicConfiguration": { - "cleanup.policy": [ - "delete", - "compact" - ], - "retention.ms": 604800000, - "retention.bytes": 1000000000, - "delete.retention.ms": 86400000, - "max.message.bytes": 1048588 - }, - "bindingVersion": "0.4.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding - extended.json deleted file mode 100644 index 17b32f84..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding - extended.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "namespace" : "staging", - "persistence" : "persistent", - "compaction" : 1000, - "geo-replication" : [ "us-east1", "us-west1" ], - "retention" : { - "time" : 7, - "size" : 1000 - }, - "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding - wrongly extended.json deleted file mode 100644 index eb0e8d65..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding - wrongly extended.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "namespace": "staging", - "persistence": "persistent", - "compaction": 1000, - "geo-replication": [ - "us-east1", - "us-west1" - ], - "retention": { - "time": 7, - "size": 1000 - }, - "ttl": 360, - "deduplication": false, - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding.json deleted file mode 100644 index 21af1c35..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/pulsar/pulsarChannelBinding.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "namespace": "staging", - "persistence": "persistent", - "compaction": 1000, - "geo-replication": [ - "us-east1", - "us-west1" - ], - "retention": { - "time": 7, - "size": 1000 - }, - "ttl": 360, - "deduplication": false, - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - extended.json deleted file mode 100644 index 4459c5b3..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - extended.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "method" : "GET", - "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : { - "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : { - "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - wrongly extended.json deleted file mode 100644 index 535cd4bc..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding - wrongly extended.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "method": "GET", - "query": { - "type": "object", - "properties": { - "ref": { - "type": "string", - "description": "Referral." - } - } - }, - "headers": { - "type": "object", - "properties": { - "Authentication": { - "type": "string", - "description": "Authentication token" - } - } - }, - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding.json deleted file mode 100644 index f30d9581..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/channel/ws/webSocketsChannelBinding.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "method": "GET", - "query": { - "type": "object", - "properties": { - "ref": { - "type": "string", - "description": "Referral." - } - } - }, - "headers": { - "type": "object", - "properties": { - "Authentication": { - "type": "string", - "description": "Authentication token" - } - } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding - extended.json deleted file mode 100644 index 98d5ef64..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding - extended.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding - wrongly extended.json deleted file mode 100644 index b3d1d1f1..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding - wrongly extended.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "contentEncoding": "gzip", - "messageType": "user.signup", - "bindingVersion": "0.2.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding.json deleted file mode 100644 index 3a56f03e..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/amqp/amqpMessageBinding.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "contentEncoding": "gzip", - "messageType": "user.signup", - "bindingVersion": "0.2.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json deleted file mode 100644 index a331d70d..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - extended.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : { - "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - wrongly extended.json deleted file mode 100644 index bbc0329e..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding - wrongly extended.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "headers": { - "type": "object", - "properties": { - "correlationId": { - "description": "Correlation ID set by application", - "type": "string" - } - } - }, - "bindingVersion": "0.0.1", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding.json deleted file mode 100644 index 04509bbf..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/anypointmq/anypointMQMessageBinding.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "headers": { - "type": "object", - "properties": { - "correlationId": { - "description": "Correlation ID set by application", - "type": "string" - } - } - }, - "bindingVersion": "0.0.1" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - extended.json deleted file mode 100644 index ba8ea89d..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - extended.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "orderingKey" : null, - "attributes" : null, - "schema" : { - "name" : "projects/your-project/schemas/message-avro", - "type" : "avro" - }, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - wrongly extended.json deleted file mode 100644 index 2219970c..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding - wrongly extended.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "schema": { - "name": "projects/your-project/schemas/message-avro", - "type": "avro" - }, - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding.json deleted file mode 100644 index 511854ad..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/googlepubsub/googlePubSubMessageBinding.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "schema": { - "name": "projects/your-project/schemas/message-avro", - "type": "avro" - }, - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - extended.json deleted file mode 100644 index d89df15a..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - extended.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : { - "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - wrongly extended.json deleted file mode 100644 index b4b71d4e..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding - wrongly extended.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "headers": { - "type": "object", - "properties": { - "Content-Type": { - "type": "string", - "enum": [ - "application/json" - ] - } - } - }, - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding.json deleted file mode 100644 index 5f7f5672..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/http/httpMessageBinding.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "headers": { - "type": "object", - "properties": { - "Content-Type": { - "type": "string", - "enum": [ - "application/json" - ] - } - } - }, - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding - extended.json deleted file mode 100644 index bf14dfb0..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding - extended.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type" : "jms", - "headers" : "Content-Type: application/json", - "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding - wrongly extended.json deleted file mode 100644 index 175d30fb..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding - wrongly extended.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "jms", - "description": "JMS stream message", - "headers": "Content-Type: application/json", - "expiry": 0, - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding.json deleted file mode 100644 index 49697805..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/ibmmq/ibmMQMessageBinding.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "jms", - "description": "JMS stream message", - "headers": "Content-Type: application/json", - "expiry": 0, - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - extended.json deleted file mode 100644 index 3fd78ce6..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - extended.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "schemaIdLocation" : "payload", - "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - wrongly extended.json deleted file mode 100644 index 37105e30..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding - wrongly extended.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "key": { - "type": "string", - "enum": [ - "myKey" - ] - }, - "schemaIdLocation": "payload", - "schemaIdPayloadEncoding": "apicurio-new", - "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding.json deleted file mode 100644 index 42340266..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/kafka/kafkaMessageBinding.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "key": { - "type": "string", - "enum": [ - "myKey" - ] - }, - "schemaIdLocation": "payload", - "schemaIdPayloadEncoding": "apicurio-new", - "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding - wrongly extended.json deleted file mode 100644 index a1ecfd51..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding.json deleted file mode 100644 index 04dbf945..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/message/mqtt/mqttMessageBinding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding - extended.json deleted file mode 100644 index a19a9822..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding - extended.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "expiration" : 100000, - "userId" : "guest", - "cc" : [ "user.logs" ], - "priority" : 10, - "deliveryMode" : 2, - "mandatory" : false, - "bcc" : [ "external.audit" ], - "replyTo" : "user.signedup", - "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding - wrongly extended.json deleted file mode 100644 index 10ba23cd..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding - wrongly extended.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "expiration": 100000, - "userId": "guest", - "cc": [ - "user.logs" - ], - "priority": 10, - "deliveryMode": 2, - "mandatory": false, - "bcc": [ - "external.audit" - ], - "replyTo": "user.signedup", - "timestamp": true, - "ack": false, - "bindingVersion": "0.2.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding.json deleted file mode 100644 index 3bfeef70..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/amqp/amqpOperationBinding.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "expiration": 100000, - "userId": "guest", - "cc": [ - "user.logs" - ], - "priority": 10, - "deliveryMode": 2, - "mandatory": false, - "bcc": [ - "external.audit" - ], - "replyTo": "user.signedup", - "timestamp": true, - "ack": false, - "bindingVersion": "0.2.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - extended.json deleted file mode 100644 index 75104850..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - extended.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "type" : "request", - "method" : "GET", - "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : [ "companyId" ], - "properties" : { - "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - } - }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - wrongly extended.json deleted file mode 100644 index 278fb5ae..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding - wrongly extended.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "request", - "method": "GET", - "query": { - "type": "object", - "required": [ - "companyId" - ], - "properties": { - "companyId": { - "type": "number", - "minimum": 1, - "description": "The Id of the company." - } - }, - "additionalProperties": false - }, - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding.json deleted file mode 100644 index d832076d..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/http/httpOperationBinding.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "request", - "method": "GET", - "query": { - "type": "object", - "required": [ - "companyId" - ], - "properties": { - "companyId": { - "type": "number", - "minimum": 1, - "description": "The Id of the company." - } - }, - "additionalProperties": false - }, - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - extended.json deleted file mode 100644 index f210b50f..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - extended.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "bindingVersion" : "0.4.0", - "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, - "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - wrongly extended.json deleted file mode 100644 index a36503dd..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding - wrongly extended.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "groupId": { - "type": "string", - "enum": [ - "myGroupId" - ] - }, - "clientId": { - "type": "string", - "enum": [ - "myClientId" - ] - }, - "bindingVersion": "0.4.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding.json deleted file mode 100644 index 542d1fe2..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/kafka/kafkaOperationBinding.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "groupId": { - "type": "string", - "enum": [ - "myGroupId" - ] - }, - "clientId": { - "type": "string", - "enum": [ - "myClientId" - ] - }, - "bindingVersion": "0.4.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding - extended.json deleted file mode 100644 index 987a9860..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding - extended.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding - wrongly extended.json deleted file mode 100644 index 6a0014f5..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding - wrongly extended.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "qos": 2, - "retain": true, - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding.json deleted file mode 100644 index 7500db5c..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/mqtt/mqttOperationBinding.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "qos": 2, - "retain": true, - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding - extended.json deleted file mode 100644 index 2a77c3b3..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding - extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "queue" : "messages", - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding - wrongly extended.json deleted file mode 100644 index 1c6e0e8e..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding - wrongly extended.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "queue": "messages", - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding.json deleted file mode 100644 index 53d874bb..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/nats/natsOperationBinding.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "queue": "messages", - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding - extended.json deleted file mode 100644 index e8a8ed88..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding - extended.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "destinations" : [ { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null - }, { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } - } ], - "bindingVersion" : "0.3.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding - wrongly extended.json deleted file mode 100644 index ef371f24..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding - wrongly extended.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } - } - ], - "bindingVersion": "0.3.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding.json deleted file mode 100644 index e5b10158..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/operation/solace/solaceOperationBinding.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } - } - ], - "bindingVersion": "0.3.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding - extended.json deleted file mode 100644 index 53447913..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding - extended.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "groupId" : "PRODCLSTR1", - "ccdtQueueManagerName" : "*", - "cipherSpec" : "ANY_TLS12_OR_HIGHER", - "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding - wrongly extended.json deleted file mode 100644 index 81ed7a44..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding - wrongly extended.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "groupId": "PRODCLSTR1", - "ccdtQueueManagerName": "*", - "multiEndpointServer": false, - "heartBeatInterval": 300, - "cipherSpec": "ANY_TLS12_OR_HIGHER", - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding.json deleted file mode 100644 index cde4b02d..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/ibmmq/ibmmqServerBinding.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "groupId": "PRODCLSTR1", - "ccdtQueueManagerName": "*", - "multiEndpointServer": false, - "heartBeatInterval": 300, - "cipherSpec": "ANY_TLS12_OR_HIGHER", - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding - extended.json deleted file mode 100644 index a0349c5c..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding - extended.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding - wrongly extended.json deleted file mode 100644 index 00eee56a..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding - wrongly extended.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "schemaRegistryUrl": "https://my-schema-registry.com", - "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding.json deleted file mode 100644 index cc2f24e8..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/kafka/kafkaServerBinding.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "schemaRegistryUrl": "https://my-schema-registry.com", - "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding - extended.json deleted file mode 100644 index 304ed881..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding - extended.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "clientId" : "guest", - "cleanSession" : true, - "lastWill" : { - "topic" : "/last-wills", - "qos" : 2, - "message" : "Guest gone offline.", - "retain" : false - }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding - wrongly extended.json deleted file mode 100644 index e3c8e972..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding - wrongly extended.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "clientId": "guest", - "cleanSession": true, - "lastWill": { - "topic": "/last-wills", - "qos": 2, - "message": "Guest gone offline.", - "retain": false - }, - "keepAlive": 60, - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding.json deleted file mode 100644 index e5073c57..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt/mqttServerBinding.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "clientId": "guest", - "cleanSession": true, - "lastWill": { - "topic": "/last-wills", - "qos": 2, - "message": "Guest gone offline.", - "retain": false - }, - "keepAlive": 60, - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding - extended.json deleted file mode 100644 index 1104cd11..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding - extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "sessionExpiryInterval" : 60, - "bindingVersion" : "0.2.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding - wrongly extended.json deleted file mode 100644 index ce682d11..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding - wrongly extended.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "sessionExpiryInterval": 60, - "bindingVersion": "0.2.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding.json deleted file mode 100644 index 1c422293..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/mqtt5/mqtt5ServerBinding.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "sessionExpiryInterval": 60, - "bindingVersion": "0.2.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding - extended.json deleted file mode 100644 index de267c67..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding - extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "tenant" : "contoso", - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding - wrongly extended.json deleted file mode 100644 index 380c5cb2..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding - wrongly extended.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "tenant": "contoso", - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding.json deleted file mode 100644 index bc86f5c2..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/pulsar/pulsarServerBinding.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "tenant": "contoso", - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding - extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding - extended.json deleted file mode 100644 index 4e9101f6..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding - extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding - wrongly extended.json deleted file mode 100644 index f6e4672f..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding - wrongly extended.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding.json b/asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding.json deleted file mode 100644 index 1e86ad5a..00000000 --- a/asyncapi-core/src/test/resources/json/v2/binding/server/solace/solaceServerBinding.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" -} \ No newline at end of file From d29ad6994aa283572c543aaa6b5243e6e6012ce4 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 24 Apr 2024 22:01:40 +0400 Subject: [PATCH 036/141] feat(bindings): WebSocket 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/183 --- .../com/asyncapi/bindings/ChannelBinding.java | 14 + .../com/asyncapi/bindings/MessageBinding.java | 14 + .../asyncapi/bindings/OperationBinding.java | 14 + .../com/asyncapi/bindings/ServerBinding.java | 14 + .../websockets/WebSocketsChannelBinding.java | 37 + .../websockets/WebSocketsMessageBinding.java | 35 + .../WebSocketsOperationBinding.java | 35 + .../websockets/WebSocketsServerBinding.java | 35 + .../channel/WebSocketsChannelBinding.java | 89 +- .../message/WebSocketsMessageBinding.java | 21 +- .../operation/WebSocketsOperationBinding.java | 21 +- .../_1_0/server/WebSocketsServerBinding.java | 21 +- .../com/asyncapi/bindings/BindingsTest.java | 14 + .../bindings/websockets/WebSocketsTest.java | 96 + .../channel/WebSocketsChannelBindingTest.java | 75 + .../message/WebSocketsMessageBindingTest.java | 40 + .../WebSocketsOperationBindingTest.java | 40 + .../server/WebSocketsServerBindingTest.java | 40 + .../channel/WebSocketsChannelBindingTest.java | 75 + .../message/WebSocketsMessageBindingTest.java | 40 + .../WebSocketsOperationBindingTest.java | 40 + .../server/WebSocketsServerBindingTest.java | 40 + .../v0/_1_0/WebSocketsBindingProvider.java | 62 + .../channel/WebSocketsChannelBindingTest.java | 41 + .../channel/WebSocketsChannelBindingTest.kt | 54 - .../message/WebSocketsMessageBindingTest.java | 39 + .../WebSocketsOperationBindingTest.java | 39 + .../server/WebSocketsServerBindingTest.java | 39 + .../channel/WebSocketsChannelBindingTest.java | 75 + .../message/WebSocketsMessageBindingTest.java | 40 + .../WebSocketsOperationBindingTest.java | 40 + .../server/WebSocketsServerBindingTest.java | 40 + .../test/kotlin/com/asyncapi/v2/SerDeTest.kt | 3 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../v3/_0_0/model/channel/ChannelTest.kt | 6 +- .../amqpChannelBinding - extended.json | 2 +- .../amqpMessageBinding - extended.json | 2 +- .../amqpOperationBinding - extended.json | 2 +- .../anypointMQChannelBinding - extended.json | 2 +- .../anypointMQMessageBinding - extended.json | 2 +- ...googlePubSubChannelBinding - extended.json | 2 +- ...googlePubSubMessageBinding - extended.json | 2 +- .../httpMessageBinding - extended.json | 2 +- .../httpOperationBinding - extended.json | 2 +- .../ibmMQChannelBinding - extended.json | 2 +- .../ibmMQMessageBinding - extended.json | 2 +- .../server/ibmmqServerBinding - extended.json | 2 +- .../kafkaMessageBinding - extended.json | 2 +- .../server/kafkaServerBinding - extended.json | 2 +- .../mqttOperationBinding - extended.json | 2 +- .../server/mqttServerBinding - extended.json | 2 +- .../natsOperationBinding - extended.json | 2 +- .../pulsarChannelBinding - extended.json | 2 +- .../pulsarServerBinding - extended.json | 2 +- .../solaceOperationBinding - extended.json | 2 +- .../solaceServerBinding - extended.json | 2 +- .../webSocketsChannelBinding - extended.json | 2 +- ...ketsChannelBinding - wrongly extended.json | 28 + .../channel/webSocketsChannelBinding.json | 22 + .../webSocketsMessageBinding - extended.json | 8 + ...ketsMessageBinding - wrongly extended.json | 9 + .../message/webSocketsMessageBinding.json | 3 + ...webSocketsOperationBinding - extended.json | 8 + ...tsOperationBinding - wrongly extended.json | 9 + .../operation/webSocketsOperationBinding.json | 3 + .../webSocketsServerBinding - extended.json | 8 + ...cketsServerBinding - wrongly extended.json | 9 + .../0.1.0/server/webSocketsServerBinding.json | 3 + .../webSocketsChannelBinding - extended.json | 27 + ...ketsChannelBinding - wrongly extended.json | 28 + .../channel/webSocketsChannelBinding.json | 22 + .../webSocketsMessageBinding - extended.json | 8 + ...ketsMessageBinding - wrongly extended.json | 9 + .../message/webSocketsMessageBinding.json | 3 + ...webSocketsOperationBinding - extended.json | 8 + ...tsOperationBinding - wrongly extended.json | 9 + .../operation/webSocketsOperationBinding.json | 3 + .../webSocketsServerBinding - extended.json | 8 + ...cketsServerBinding - wrongly extended.json | 9 + .../server/webSocketsServerBinding.json | 3 + .../webSocketsChannelBinding - extended.json | 27 + ...ketsChannelBinding - wrongly extended.json | 28 + .../channel/webSocketsChannelBinding.json | 22 + .../webSocketsMessageBinding - extended.json | 8 + ...ketsMessageBinding - wrongly extended.json | 9 + .../message/webSocketsMessageBinding.json | 3 + ...webSocketsOperationBinding - extended.json | 8 + ...tsOperationBinding - wrongly extended.json | 9 + .../operation/webSocketsOperationBinding.json | 3 + .../webSocketsServerBinding - extended.json | 8 + ...cketsServerBinding - wrongly extended.json | 9 + .../server/webSocketsServerBinding.json | 3 + .../webSocketsChannelBinding - extended.json | 27 + ...ketsChannelBinding - wrongly extended.json | 0 .../channel/webSocketsChannelBinding.json | 0 .../webSocketsMessageBinding - extended.json | 8 + ...ketsMessageBinding - wrongly extended.json | 8 + .../message/webSocketsMessageBinding.json | 1 + ...webSocketsOperationBinding - extended.json | 8 + ...tsOperationBinding - wrongly extended.json | 8 + .../operation/webSocketsOperationBinding.json | 1 + .../webSocketsServerBinding - extended.json | 8 + ...cketsServerBinding - wrongly extended.json | 8 + .../server/webSocketsServerBinding.json | 1 + .../v2/2.0.0/model/asyncapi - extended.json | 4031 +--------- .../model/channel/channelItem - extended.json | 1729 +---- .../channel/message/message - extended.json | 559 +- .../message/messageTrait - extended.json | 422 +- .../operation with message - extended.json | 1009 +-- ... with reference to message - extended.json | 450 +- .../operation/operationTrait - extended.json | 225 +- .../model/channel/parameter - extended.json | 46 +- .../components/components - extended.json | 2274 +----- .../2.0.0/model/server/server - extended.json | 28 +- .../v2/2.6.0/model/asyncapi - extended.json | 6848 ++--------------- .../model/channel/channelItem - extended.json | 2264 +----- .../channel/message/message - extended.json | 555 +- .../message/messageTrait - extended.json | 418 +- .../operation with message - extended.json | 997 +-- ...eration with oneOf message - extended.json | 997 +-- ... with reference to message - extended.json | 442 +- .../operation/operationTrait - extended.json | 221 +- .../parameter with schema - extended.json | 46 +- .../components/components - extended.json | 4551 +---------- .../2.6.0/model/server/server - extended.json | 31 +- .../http/httpBasic - extended.json | 1 - .../v3/3.0.0/model/asyncapi - extended.json | 2052 ++--- .../model/channel/channel - extended.json | 312 +- .../channel with reference - extended.json | 312 +- .../channel/message/message - extended.json | 96 +- .../channel/message/message 2 - extended.json | 96 +- .../message with reference - extended.json | 96 +- .../message/messageTrait - extended.json | 24 +- .../message/messageTrait 2 - extended.json | 24 +- ...essageTrait with reference - extended.json | 24 +- .../components/components - extended.json | 1260 +-- .../model/operation/operation - extended.json | 60 +- .../operation with reference - extended.json | 60 +- .../operation/operationTrait - extended.json | 20 +- ...rationTrait with reference - extended.json | 20 +- .../3.0.0/model/server/server - extended.json | 24 +- .../server with reference - extended.json | 24 +- 143 files changed, 5818 insertions(+), 28672 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/channel/WebSocketsChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/message/WebSocketsMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/operation/WebSocketsOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/server/WebSocketsServerBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/channel/WebSocketsChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/message/WebSocketsMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/operation/WebSocketsOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/server/WebSocketsServerBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/WebSocketsBindingProvider.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/channel/WebSocketsChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/message/WebSocketsMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/operation/WebSocketsOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/server/WebSocketsServerBindingTest.java rename asyncapi-core/src/test/resources/bindings/websockets/{ => 0.1.0}/channel/webSocketsChannelBinding - extended.json (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - extended.json rename asyncapi-core/src/test/resources/bindings/websockets/{ => without version}/channel/webSocketsChannelBinding - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/bindings/websockets/{ => without version}/channel/webSocketsChannelBinding.json (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java index c15be28a..fa6934a1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java @@ -1,7 +1,10 @@ package com.asyncapi.bindings; import com.asyncapi.ExtendableObject; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; import lombok.EqualsAndHashCode; +import org.jetbrains.annotations.Nullable; /** * Describes protocol-specific definition for a channel. @@ -13,6 +16,17 @@ * @author Pavel Bodiachevskii * @version 3.0.0 */ +@Data @EqualsAndHashCode(callSuper = true) public class ChannelBinding extends ExtendableObject { + + /** + * The version of this binding. + *

+ * If omitted, 'latest' MUST be assumed. + */ + @Nullable + @JsonProperty("bindingVersion") + private String bindingVersion; + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java index 925b533c..ecd159f3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java @@ -1,13 +1,27 @@ package com.asyncapi.bindings; import com.asyncapi.ExtendableObject; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; import lombok.EqualsAndHashCode; +import org.jetbrains.annotations.Nullable; /** * Describes AsyncAPI message binding. * * @author Pavel Bodiachevskii */ +@Data @EqualsAndHashCode(callSuper = true) public class MessageBinding extends ExtendableObject { + + /** + * The version of this binding. + *

+ * If omitted, 'latest' MUST be assumed. + */ + @Nullable + @JsonProperty("bindingVersion") + private String bindingVersion; + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java index 6f5c6583..efde44df 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java @@ -1,7 +1,10 @@ package com.asyncapi.bindings; import com.asyncapi.ExtendableObject; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; import lombok.EqualsAndHashCode; +import org.jetbrains.annotations.Nullable; /** * Describes protocol-specific definition for an operation. @@ -13,6 +16,17 @@ * @author Pavel Bodiachevskii * @version 3.0.0 */ +@Data @EqualsAndHashCode(callSuper = true) public class OperationBinding extends ExtendableObject { + + /** + * The version of this binding. + *

+ * If omitted, 'latest' MUST be assumed. + */ + @Nullable + @JsonProperty("bindingVersion") + private String bindingVersion; + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java index b1ab004a..b0ea9840 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java @@ -1,7 +1,10 @@ package com.asyncapi.bindings; import com.asyncapi.ExtendableObject; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; import lombok.EqualsAndHashCode; +import org.jetbrains.annotations.Nullable; /** * Describes protocol-specific definition for a server. @@ -13,6 +16,17 @@ * @author Pavel Bodiachevskii * @version 3.0.0 */ +@Data @EqualsAndHashCode(callSuper = true) public class ServerBinding extends ExtendableObject { + + /** + * The version of this binding. + *

+ * If omitted, 'latest' MUST be assumed. + */ + @Nullable + @JsonProperty("bindingVersion") + private String bindingVersion; + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsChannelBinding.java new file mode 100644 index 00000000..0f8fa26d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsChannelBinding.java @@ -0,0 +1,37 @@ +package com.asyncapi.bindings.websockets; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * Describes WebSockets channel binding. + *

+ * When using WebSockets, the channel represents the connection. + *

+ * Unlike other protocols that support multiple virtual channels (topics, routing keys, etc.) per connection, + * WebSockets doesn't support virtual channels or, put it another way, there's only one channel and its characteristics + * are strongly related to the protocol used for the handshake, i.e., HTTP. + * + * @version 0.1.0 + * @see WebSockets channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class WebSocketsChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsMessageBinding.java new file mode 100644 index 00000000..b93197bd --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsMessageBinding.java @@ -0,0 +1,35 @@ +package com.asyncapi.bindings.websockets; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes WebSockets message binding. + * + * @version 0.1.0 + * @see WebSockets message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class WebSocketsMessageBinding extends MessageBinding {} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsOperationBinding.java new file mode 100644 index 00000000..a28cb4a9 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsOperationBinding.java @@ -0,0 +1,35 @@ +package com.asyncapi.bindings.websockets; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes WebSockets operation binding. + * + * @version 0.1.0 + * @see WebSockets operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class WebSocketsOperationBinding extends OperationBinding {} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsServerBinding.java new file mode 100644 index 00000000..df8b25d4 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsServerBinding.java @@ -0,0 +1,35 @@ +package com.asyncapi.bindings.websockets; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes WebSockets server binding. + * + * @version 0.1.0 + * @see WebSockets server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class WebSocketsServerBinding extends ServerBinding {} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java index 9aef5009..4f74941e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java @@ -1,13 +1,17 @@ package com.asyncapi.bindings.websockets.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Map; + /** * Describes WebSockets channel binding. *

@@ -22,12 +26,22 @@ * @author Pavel Bodiachevskii */ @Data -@Builder -@NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes WebSockets channel binding.") -public class WebSocketsChannelBinding extends ChannelBinding { +public class WebSocketsChannelBinding extends com.asyncapi.bindings.websockets.WebSocketsChannelBinding { + + public WebSocketsChannelBinding() { + this.setBindingVersion("0.1.0"); + } + + public WebSocketsChannelBinding(@NotNull WebSocketsChannelBindingBuilder webSocketsChannelBindingBuilder) { + this.method = webSocketsChannelBindingBuilder.method; + this.query = webSocketsChannelBindingBuilder.query; + this.headers = webSocketsChannelBindingBuilder.headers; + this.setBindingVersion("0.1.0"); + this.extensionFields = webSocketsChannelBindingBuilder.extensionFields; + } /** * The HTTP method to use when establishing the connection. @@ -59,13 +73,62 @@ public class WebSocketsChannelBinding extends ChannelBinding { @JsonPropertyDescription("A Schema object containing the definitions of the HTTP headers to use when establishing the connection. This schema MUST be of type object and have a properties key.") private AsyncAPISchema headers; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + + public static WebSocketsChannelBindingBuilder builder() { + return new WebSocketsChannelBindingBuilder(); + } + + public static class WebSocketsChannelBindingBuilder { + + @Nullable + private WebSocketsChannelMethod method; + + @Nullable + private AsyncAPISchema query; + + @Nullable + private AsyncAPISchema headers; + + @Nullable + private Map extensionFields; + + @NotNull + public WebSocketsChannelBindingBuilder method(@Nullable WebSocketsChannelMethod method) { + this.method = method; + return this; + } + + @NotNull + public WebSocketsChannelBindingBuilder query(@Nullable AsyncAPISchema query) { + this.query = query; + return this; + } + + @NotNull + public WebSocketsChannelBindingBuilder headers(@Nullable AsyncAPISchema headers) { + this.headers = headers; + return this; + } + + @NotNull + public WebSocketsChannelBindingBuilder extensionFields(@Nullable Map extensionFields) { + this.extensionFields = extensionFields; + return this; + } + + public WebSocketsChannelBinding build() { + return new WebSocketsChannelBinding(this); + } + + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java index 9ef209c4..8490162c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java @@ -1,9 +1,8 @@ package com.asyncapi.bindings.websockets.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -17,7 +16,21 @@ * @author Pavel Bodiachevskii */ @Data -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class WebSocketsMessageBinding extends MessageBinding { +public class WebSocketsMessageBinding extends com.asyncapi.bindings.websockets.WebSocketsMessageBinding { + + public WebSocketsMessageBinding() { + this.setBindingVersion("0.1.0"); + } + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java index 96c1dd1e..18b5e20e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java @@ -1,9 +1,8 @@ package com.asyncapi.bindings.websockets.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -17,7 +16,21 @@ * @author Pavel Bodiachevskii */ @Data -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class WebSocketsOperationBinding extends OperationBinding { +public class WebSocketsOperationBinding extends com.asyncapi.bindings.websockets.WebSocketsOperationBinding { + + public WebSocketsOperationBinding() { + this.setBindingVersion("0.1.0"); + } + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java index b110be49..fadd582b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java @@ -1,9 +1,8 @@ package com.asyncapi.bindings.websockets.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -17,7 +16,21 @@ * @author Pavel Bodiachevskii */ @Data -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class WebSocketsServerBinding extends ServerBinding { +public class WebSocketsServerBinding extends com.asyncapi.bindings.websockets.WebSocketsServerBinding { + + public WebSocketsServerBinding() { + this.setBindingVersion("0.1.0"); + } + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java new file mode 100644 index 00000000..be55796a --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java @@ -0,0 +1,14 @@ +package com.asyncapi.bindings; + +import com.asyncapi.bindings.websockets.WebSocketsTest; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("Bindings") +public class BindingsTest { + + @Nested + @DisplayName("WebSockets") + class WebSockets extends WebSocketsTest {} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsTest.java new file mode 100644 index 00000000..59a37e9a --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsTest.java @@ -0,0 +1,96 @@ +package com.asyncapi.bindings.websockets; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +public abstract class WebSocketsTest { + + @Nested + @DisplayName("unknown version") + class UnknownVersion { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.websockets.unknownversion.channel.WebSocketsChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.websockets.unknownversion.message.WebSocketsMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.websockets.unknownversion.operation.WebSocketsOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.websockets.unknownversion.server.WebSocketsServerBindingTest {} + + } + + @Nested + @DisplayName("without version") + class WithoutVersion { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.websockets.withoutversion.channel.WebSocketsChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.websockets.withoutversion.message.WebSocketsMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.websockets.withoutversion.operation.WebSocketsOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.websockets.withoutversion.server.WebSocketsServerBindingTest {} + + } + + @Nested + @DisplayName("latest") + class Latest { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.websockets.latest.channel.WebSocketsChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.websockets.latest.message.WebSocketsMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.websockets.latest.operation.WebSocketsOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.websockets.latest.server.WebSocketsServerBindingTest {} + + } + + @Nested + @DisplayName("0.1.0") + class V0_1_0 { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBindingTest {} + + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/channel/WebSocketsChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/channel/WebSocketsChannelBindingTest.java new file mode 100644 index 00000000..9d210c7c --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/channel/WebSocketsChannelBindingTest.java @@ -0,0 +1,75 @@ +package com.asyncapi.bindings.websockets.latest.channel; + +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod; +import com.asyncapi.v3.SerDeTest; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; +import org.jetbrains.annotations.NotNull; + +import java.util.HashMap; +import java.util.Map; + +public abstract class WebSocketsChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/latest/channel/webSocketsChannelBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/latest/channel/webSocketsChannelBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/latest/channel/webSocketsChannelBinding - wrongly extended.json"; + } + + @NotNull + @Override + public WebSocketsChannelBinding build() { + Map queryProperties = new HashMap<>(); + queryProperties.put( + "ref", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Referral.") + .build() + ); + + Map headersProperties = new HashMap<>(); + headersProperties.put( + "Authentication", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Authentication token") + .build() + ); + + return WebSocketsChannelBinding.builder() + .method(WebSocketsChannelMethod.GET) + .query(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(queryProperties) + .build() + ) + .headers(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(headersProperties) + .build() + ) + .build(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/message/WebSocketsMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/message/WebSocketsMessageBindingTest.java new file mode 100644 index 00000000..16a6146a --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/message/WebSocketsMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.websockets.latest.message; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/latest/message/webSocketsMessageBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/latest/message/webSocketsMessageBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/latest/message/webSocketsMessageBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsMessageBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/operation/WebSocketsOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/operation/WebSocketsOperationBindingTest.java new file mode 100644 index 00000000..2655e6a2 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/operation/WebSocketsOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.websockets.latest.operation; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/latest/operation/webSocketsOperationBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/latest/operation/webSocketsOperationBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/latest/operation/webSocketsOperationBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsOperationBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/server/WebSocketsServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/server/WebSocketsServerBindingTest.java new file mode 100644 index 00000000..243254e2 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/server/WebSocketsServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.websockets.latest.server; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/latest/server/webSocketsServerBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/latest/server/webSocketsServerBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/channel/WebSocketsChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/channel/WebSocketsChannelBindingTest.java new file mode 100644 index 00000000..f53fbb8e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/channel/WebSocketsChannelBindingTest.java @@ -0,0 +1,75 @@ +package com.asyncapi.bindings.websockets.unknownversion.channel; + +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod; +import com.asyncapi.v3.SerDeTest; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; +import org.jetbrains.annotations.NotNull; + +import java.util.HashMap; +import java.util.Map; + +public abstract class WebSocketsChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/unknown version/channel/webSocketsChannelBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/unknown version/channel/webSocketsChannelBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/unknown version/channel/webSocketsChannelBinding - wrongly extended.json"; + } + + @NotNull + @Override + public WebSocketsChannelBinding build() { + Map queryProperties = new HashMap<>(); + queryProperties.put( + "ref", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Referral.") + .build() + ); + + Map headersProperties = new HashMap<>(); + headersProperties.put( + "Authentication", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Authentication token") + .build() + ); + + return WebSocketsChannelBinding.builder() + .method(WebSocketsChannelMethod.GET) + .query(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(queryProperties) + .build() + ) + .headers(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(headersProperties) + .build() + ) + .build(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/message/WebSocketsMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/message/WebSocketsMessageBindingTest.java new file mode 100644 index 00000000..832bac40 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/message/WebSocketsMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.websockets.unknownversion.message; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/unknown version/message/webSocketsMessageBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/unknown version/message/webSocketsMessageBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/unknown version/message/webSocketsMessageBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsMessageBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/operation/WebSocketsOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/operation/WebSocketsOperationBindingTest.java new file mode 100644 index 00000000..0f93bed1 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/operation/WebSocketsOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.websockets.unknownversion.operation; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/unknown version/operation/webSocketsOperationBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/unknown version/operation/webSocketsOperationBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/unknown version/operation/webSocketsOperationBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsOperationBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/server/WebSocketsServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/server/WebSocketsServerBindingTest.java new file mode 100644 index 00000000..6bb45d05 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/server/WebSocketsServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.websockets.unknownversion.server; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/unknown version/server/webSocketsServerBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/unknown version/server/webSocketsServerBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/unknown version/server/webSocketsServerBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/WebSocketsBindingProvider.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/WebSocketsBindingProvider.java new file mode 100644 index 00000000..08f18445 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/WebSocketsBindingProvider.java @@ -0,0 +1,62 @@ +package com.asyncapi.bindings.websockets.v0._1_0; + +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; + +import java.util.HashMap; +import java.util.Map; + +public class WebSocketsBindingProvider { + + public static WebSocketsChannelBinding channel() { + Map queryProperties = new HashMap<>(); + queryProperties.put( + "ref", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Referral.") + .build() + ); + + Map headersProperties = new HashMap<>(); + headersProperties.put( + "Authentication", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Authentication token") + .build() + ); + + return WebSocketsChannelBinding.builder() + .method(WebSocketsChannelMethod.GET) + .query(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(queryProperties) + .build() + ) + .headers(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(headersProperties) + .build() + ) + .build(); + } + + public static WebSocketsMessageBinding message() { + return new WebSocketsMessageBinding(); + } + + public static WebSocketsOperationBinding operation() { + return new WebSocketsOperationBinding(); + } + + public static WebSocketsServerBinding server() { + return new WebSocketsServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.java new file mode 100644 index 00000000..8d68f2da --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.java @@ -0,0 +1,41 @@ +package com.asyncapi.bindings.websockets.v0._1_0.channel; + +import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Nested; + +@Nested +public abstract class WebSocketsChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/0.1.0/channel/webSocketsChannelBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - wrongly extended.json"; + } + + @NotNull + @Override + public WebSocketsChannelBinding build() { + return WebSocketsBindingProvider.channel(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt deleted file mode 100644 index 83966ce4..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.asyncapi.bindings.websockets.v0._1_0.channel - -import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.Type - - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class WebSocketsChannelBindingTest: SerDeTest() { - - override fun objectClass() = WebSocketsChannelBinding::class.java - - override fun baseObjectJson() = "/bindings/websockets/channel/webSocketsChannelBinding.json" - - override fun extendedObjectJson() = "/bindings/websockets/channel/webSocketsChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/websockets/channel/webSocketsChannelBinding - wrongly extended.json" - - override fun build(): WebSocketsChannelBinding { - return WebSocketsChannelBinding.builder() - .method(WebSocketsChannelMethod.GET) - .query(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(mapOf( - Pair( - "ref", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Referral.") - .build() - ) - )) - .build() - ) - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(mapOf( - Pair( - "Authentication", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Authentication token") - .build() - ) - )) - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBindingTest.java new file mode 100644 index 00000000..ec637d9c --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBindingTest.java @@ -0,0 +1,39 @@ +package com.asyncapi.bindings.websockets.v0._1_0.message; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/0.1.0/message/webSocketsMessageBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/0.1.0/message/webSocketsMessageBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/0.1.0/message/webSocketsMessageBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsMessageBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBindingTest.java new file mode 100644 index 00000000..9d6522c8 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBindingTest.java @@ -0,0 +1,39 @@ +package com.asyncapi.bindings.websockets.v0._1_0.operation; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/0.1.0/operation/webSocketsOperationBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsOperationBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBindingTest.java new file mode 100644 index 00000000..d2308147 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBindingTest.java @@ -0,0 +1,39 @@ +package com.asyncapi.bindings.websockets.v0._1_0.server; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/0.1.0/server/webSocketsServerBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/channel/WebSocketsChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/channel/WebSocketsChannelBindingTest.java new file mode 100644 index 00000000..f66190b7 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/channel/WebSocketsChannelBindingTest.java @@ -0,0 +1,75 @@ +package com.asyncapi.bindings.websockets.withoutversion.channel; + +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod; +import com.asyncapi.v3.SerDeTest; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; +import org.jetbrains.annotations.NotNull; + +import java.util.HashMap; +import java.util.Map; + +public abstract class WebSocketsChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/without version/channel/webSocketsChannelBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/without version/channel/webSocketsChannelBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/without version/channel/webSocketsChannelBinding - wrongly extended.json"; + } + + @NotNull + @Override + public WebSocketsChannelBinding build() { + Map queryProperties = new HashMap<>(); + queryProperties.put( + "ref", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Referral.") + .build() + ); + + Map headersProperties = new HashMap<>(); + headersProperties.put( + "Authentication", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Authentication token") + .build() + ); + + return WebSocketsChannelBinding.builder() + .method(WebSocketsChannelMethod.GET) + .query(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(queryProperties) + .build() + ) + .headers(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(headersProperties) + .build() + ) + .build(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/message/WebSocketsMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/message/WebSocketsMessageBindingTest.java new file mode 100644 index 00000000..09cb04c1 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/message/WebSocketsMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.websockets.withoutversion.message; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/without version/message/webSocketsMessageBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/without version/message/webSocketsMessageBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/without version/message/webSocketsMessageBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsMessageBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/operation/WebSocketsOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/operation/WebSocketsOperationBindingTest.java new file mode 100644 index 00000000..d43bf745 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/operation/WebSocketsOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.websockets.withoutversion.operation; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/without version/operation/webSocketsOperationBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/without version/operation/webSocketsOperationBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/without version/operation/webSocketsOperationBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsOperationBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/server/WebSocketsServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/server/WebSocketsServerBindingTest.java new file mode 100644 index 00000000..16643a48 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/server/WebSocketsServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.websockets.withoutversion.server; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class WebSocketsServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/without version/server/webSocketsServerBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/without version/server/webSocketsServerBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt index 05c3f074..22550860 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v2 import com.asyncapi.ExtendableObject +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.JsonMappingException import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions @@ -9,7 +10,7 @@ import org.junit.jupiter.api.Test abstract class SerDeTest { - protected val objectMapper = ObjectMapper() + protected val objectMapper = ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL) protected abstract fun objectClass(): Class diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 32aa6ca3..d4d4b595 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -23,7 +23,7 @@ import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBindingTest +import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider class ChannelItemTest: SerDeTest() { @@ -73,7 +73,7 @@ class ChannelItemTest: SerDeTest() { Pair("solace", SolaceChannelBinding()), Pair("sqs", SQSChannelBinding()), Pair("stomp", STOMPChannelBinding()), - Pair("ws", WebSocketsChannelBindingTest().build()) + Pair("ws", WebSocketsBindingProvider.channel()) ) } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 97b43f11..babcdfdb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBin import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBindingTest +import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider class ChannelItemTest: SerDeTest() { @@ -62,7 +62,7 @@ class ChannelItemTest: SerDeTest() { Pair("solace", Reference("#/components/channelBindings/solace")), Pair("sqs", Reference("#/components/channelBindings/sqs")), Pair("stomp", Reference("#/components/channelBindings/stomp")), - Pair("ws", WebSocketsChannelBindingTest().build()) + Pair("ws", WebSocketsBindingProvider.channel()) ) } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 33584a3c..cbdda007 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBin import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBindingTest +import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider class ChannelTest: SerDeTest() { @@ -82,7 +82,7 @@ class ChannelTest: SerDeTest() { Pair("solace", Reference("#/components/channelBindings/solace")), Pair("sqs", Reference("#/components/channelBindings/sqs")), Pair("stomp", Reference("#/components/channelBindings/stomp")), - Pair("ws", WebSocketsChannelBindingTest().build()) + Pair("ws", WebSocketsBindingProvider.channel()) ) } } @@ -155,7 +155,7 @@ class ChannelTestWithReference: SerDeTest() { Pair("solace", Reference("#/components/channelBindings/solace")), Pair("sqs", Reference("#/components/channelBindings/sqs")), Pair("stomp", Reference("#/components/channelBindings/stomp")), - Pair("ws", WebSocketsChannelBindingTest().build()) + Pair("ws", WebSocketsBindingProvider.channel()) ) } } diff --git a/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - extended.json index 61ef0ad3..9c9d16e3 100644 --- a/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -14,7 +15,6 @@ "autoDelete" : false, "vhost" : "/" }, - "bindingVersion" : "0.2.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - extended.json index 98d5ef64..443f64cb 100644 --- a/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - extended.json @@ -1,7 +1,7 @@ { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", "messageType" : "user.signup", - "bindingVersion" : "0.2.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - extended.json index a19a9822..65ad1577 100644 --- a/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -9,7 +10,6 @@ "replyTo" : "user.signedup", "timestamp" : true, "ack" : false, - "bindingVersion" : "0.2.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json index 4a27096c..41b3abd8 100644 --- a/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json @@ -1,7 +1,7 @@ { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", "destinationType" : "exchange", - "bindingVersion" : "0.0.1", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - extended.json index e137e19d..8ea89356 100644 --- a/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -8,7 +9,6 @@ } } }, - "bindingVersion" : "0.0.1", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json index 2d00b527..e5475859 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -8,7 +9,6 @@ "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" }, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json index e0d383d4..03c80f99 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json @@ -1,9 +1,9 @@ { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" }, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - extended.json index 436e5391..7328908b 100644 --- a/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -8,7 +9,6 @@ } } }, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - extended.json index 4b10d04b..ed626226 100644 --- a/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -13,7 +14,6 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json index a0f4e987..f3e6ae31 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -12,7 +13,6 @@ "lastMsgRetained" : true }, "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - extended.json index bf14dfb0..ff8bc475 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - extended.json @@ -1,9 +1,9 @@ { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", "expiry" : 0, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - extended.json index 53447913..ef2ad7e5 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - extended.json @@ -1,10 +1,10 @@ { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - extended.json index 380a3d0c..3325c99e 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6,7 +7,6 @@ "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - extended.json index a0349c5c..a0eb3c82 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - extended.json @@ -1,7 +1,7 @@ { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - extended.json index 987a9860..8a8a7501 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - extended.json @@ -1,7 +1,7 @@ { + "bindingVersion" : "0.1.0", "qos" : 2, "retain" : true, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - extended.json index 304ed881..88e46702 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -8,7 +9,6 @@ "retain" : false }, "keepAlive" : 60, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - extended.json index 2a77c3b3..0228f02a 100644 --- a/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - extended.json @@ -1,6 +1,6 @@ { - "queue" : "messages", "bindingVersion" : "0.1.0", + "queue" : "messages", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - extended.json index 17b32f84..77511187 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -9,7 +10,6 @@ }, "ttl" : 360, "deduplication" : false, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - extended.json index de267c67..c329a6b5 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - extended.json @@ -1,6 +1,6 @@ { - "tenant" : "contoso", "bindingVersion" : "0.1.0", + "tenant" : "contoso", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - extended.json index 97da1987..4b0c664e 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -20,7 +21,6 @@ "topicSubscriptions" : [ "person/*/updated" ] } } ], - "bindingVersion" : "0.3.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - extended.json index 4e9101f6..c545b3af 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - extended.json @@ -1,6 +1,6 @@ { - "msgVpn" : "solace.private.net", "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - extended.json index cc6e6930..79e2b501 100644 --- a/asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - extended.json @@ -1,4 +1,5 @@ { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -18,7 +19,6 @@ } } }, - "bindingVersion" : "0.1.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - wrongly extended.json new file mode 100644 index 00000000..7d7f59d8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - wrongly extended.json @@ -0,0 +1,28 @@ +{ + "bindingVersion": "0.1.0", + "method": "GET", + "query": { + "type": "object", + "properties": { + "ref": { + "type": "string", + "description": "Referral." + } + } + }, + "headers": { + "type": "object", + "properties": { + "Authentication": { + "type": "string", + "description": "Authentication token" + } + } + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding.json new file mode 100644 index 00000000..00d45e5d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding.json @@ -0,0 +1,22 @@ +{ + "method": "GET", + "query": { + "type": "object", + "properties": { + "ref": { + "type": "string", + "description": "Referral." + } + } + }, + "headers": { + "type": "object", + "properties": { + "Authentication": { + "type": "string", + "description": "Authentication token" + } + } + }, + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - extended.json new file mode 100644 index 00000000..79e2b501 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - extended.json @@ -0,0 +1,27 @@ +{ + "bindingVersion" : "0.1.0", + "method" : "GET", + "query" : { + "type" : "object", + "properties" : { + "ref" : { + "type" : "string", + "description" : "Referral." + } + } + }, + "headers" : { + "type" : "object", + "properties" : { + "Authentication" : { + "type" : "string", + "description" : "Authentication token" + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - wrongly extended.json new file mode 100644 index 00000000..82c7f94c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - wrongly extended.json @@ -0,0 +1,28 @@ +{ + "method": "GET", + "query": { + "type": "object", + "properties": { + "ref": { + "type": "string", + "description": "Referral." + } + } + }, + "headers": { + "type": "object", + "properties": { + "Authentication": { + "type": "string", + "description": "Authentication token" + } + } + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding.json new file mode 100644 index 00000000..c5c07b8a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding.json @@ -0,0 +1,22 @@ +{ + "method": "GET", + "query": { + "type": "object", + "properties": { + "ref": { + "type": "string", + "description": "Referral." + } + } + }, + "headers": { + "type": "object", + "properties": { + "Authentication": { + "type": "string", + "description": "Authentication token" + } + } + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - extended.json new file mode 100644 index 00000000..79e2b501 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - extended.json @@ -0,0 +1,27 @@ +{ + "bindingVersion" : "0.1.0", + "method" : "GET", + "query" : { + "type" : "object", + "properties" : { + "ref" : { + "type" : "string", + "description" : "Referral." + } + } + }, + "headers" : { + "type" : "object", + "properties" : { + "Authentication" : { + "type" : "string", + "description" : "Authentication token" + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - wrongly extended.json new file mode 100644 index 00000000..01ba2357 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - wrongly extended.json @@ -0,0 +1,28 @@ +{ + "bindingVersion": "0.199.36", + "method": "GET", + "query": { + "type": "object", + "properties": { + "ref": { + "type": "string", + "description": "Referral." + } + } + }, + "headers": { + "type": "object", + "properties": { + "Authentication": { + "type": "string", + "description": "Authentication token" + } + } + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding.json new file mode 100644 index 00000000..6099c36e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding.json @@ -0,0 +1,22 @@ +{ + "method": "GET", + "query": { + "type": "object", + "properties": { + "ref": { + "type": "string", + "description": "Referral." + } + } + }, + "headers": { + "type": "object", + "properties": { + "Authentication": { + "type": "string", + "description": "Authentication token" + } + } + }, + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - extended.json new file mode 100644 index 00000000..79e2b501 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - extended.json @@ -0,0 +1,27 @@ +{ + "bindingVersion" : "0.1.0", + "method" : "GET", + "query" : { + "type" : "object", + "properties" : { + "ref" : { + "type" : "string", + "description" : "Referral." + } + } + }, + "headers" : { + "type" : "object", + "properties" : { + "Authentication" : { + "type" : "string", + "description" : "Authentication token" + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/channel/webSocketsChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index b2e6d070..4ef8cbc0 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -26,13 +26,9 @@ "variables" : { "username" : { "description" : "This value is assigned by the service provider, in this example `gigantic-server.com`", - "examples" : null, - "enum" : null, "default" : "demo" }, "port" : { - "description" : null, - "examples" : null, "enum" : [ "8883", "8884" ], "default" : "8883" } @@ -46,21 +42,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -69,8 +66,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -78,24 +74,25 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } } }, "channels" : { "messages" : { - "$ref" : null, "description" : "This channel is used to exchange messages about users signing up", "subscribe" : { "operationId" : "sendMessage", @@ -115,6 +112,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -124,242 +122,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -369,27 +182,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "traits" : [ { "$ref" : "#/components/operationTraits/sendMessage" @@ -411,6 +221,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -420,242 +231,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -665,27 +291,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } } ], "message" : { @@ -710,6 +333,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -719,242 +343,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -964,27 +403,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "traits" : [ { "$ref" : "#/components/operationTraits/sendMessage" @@ -1006,6 +442,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -1015,242 +452,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -1260,313 +512,50 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } } ], "message" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -1579,17 +568,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -1597,296 +580,59 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -1900,7 +646,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "examples" : [ { "headers" : { @@ -1925,57 +673,14 @@ "userId" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" } }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -1990,32 +695,29 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -2028,8 +730,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { }, "kafka" : { @@ -2050,6 +751,7 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -2059,8 +761,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { }, "sns" : { }, @@ -2068,214 +769,26 @@ "sqs" : { }, "stomp" : { }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } } } @@ -2283,288 +796,28 @@ "components" : { "schemas" : { "Category" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "id" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "integer", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : "int64", - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "format" : "int64" }, "name" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "Tag" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "id" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "integer", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : "int64", - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "format" : "int64" }, "name" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "User" : { "$ref" : "#/components/schemas/user" @@ -2573,288 +826,28 @@ "messages" : { "userSignup" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -2867,17 +860,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -2885,296 +872,59 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -3188,7 +938,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "examples" : [ { "headers" : { @@ -3277,8 +1029,7 @@ "httpBasic" : { "type" : "http", "description" : "http", - "scheme" : "basic", - "bearerFormat" : null + "scheme" : "basic" }, "httpBearer" : { "type" : "http", @@ -3309,51 +1060,7 @@ "parameter" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" }, @@ -3386,6 +1093,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -3395,242 +1103,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -3640,173 +1163,41 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } } }, "messageTraits" : { "userSignup" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -3819,17 +1210,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -3837,296 +1222,59 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -4140,7 +1288,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "examples" : [ { "headers" : { @@ -4164,21 +1314,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -4187,8 +1338,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -4196,21 +1346,24 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "channelBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -4225,32 +1378,29 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -4263,8 +1413,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { }, "kafka" : { @@ -4285,6 +1434,7 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -4294,8 +1444,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { }, "sns" : { }, @@ -4303,218 +1452,31 @@ "sqs" : { }, "stomp" : { }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } }, "operationBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4524,242 +1486,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4769,320 +1546,80 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "messageBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -5096,7 +1633,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } }, "tags" : [ { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 94a21f1a..69c351b6 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -1,5 +1,4 @@ { - "$ref" : null, "description" : "This channel is used to exchange messages about users signing up", "subscribe" : { "operationId" : "sendMessage", @@ -19,6 +18,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -28,242 +28,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -273,27 +88,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "traits" : [ { "$ref" : "#/components/operationTraits/sendMessage" @@ -315,6 +127,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -324,242 +137,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -569,27 +197,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } } ], "message" : { @@ -614,6 +239,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -623,242 +249,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -868,27 +309,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "traits" : [ { "$ref" : "#/components/operationTraits/sendMessage" @@ -910,6 +348,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -919,242 +358,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -1164,313 +418,50 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } } ], "message" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -1483,17 +474,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -1501,296 +486,59 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -1804,7 +552,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "examples" : [ { "headers" : { @@ -1829,57 +579,14 @@ "userId" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" } }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -1894,32 +601,29 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -1932,8 +636,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { }, "kafka" : { @@ -1954,6 +657,7 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -1963,8 +667,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { }, "sns" : { }, @@ -1972,214 +675,26 @@ "sqs" : { }, "stomp" : { }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } }, "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 9011f529..b832d79b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -1,287 +1,27 @@ { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -294,17 +34,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -312,296 +46,59 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -615,7 +112,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "examples" : [ { "headers" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index fba1e181..7caac6e1 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -1,145 +1,16 @@ { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -152,17 +23,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -170,296 +35,59 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -473,7 +101,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "examples" : [ { "headers" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 4f5bf672..aa5768ea 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -16,6 +16,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -25,242 +26,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -270,27 +86,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "traits" : [ { "$ref" : "#/components/operationTraits/sendMessage" @@ -312,6 +125,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -321,242 +135,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -566,313 +195,50 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } } ], "message" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -885,17 +251,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -903,296 +263,59 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -1206,7 +329,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "examples" : [ { "headers" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index 0a552e6d..449cd6d9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -16,6 +16,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -25,242 +26,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -270,27 +86,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "traits" : [ { "$ref" : "#/components/operationTraits/sendMessage" @@ -312,6 +125,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -321,242 +135,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -566,27 +195,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } } ], "message" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 6c1ec246..cc042b31 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -16,6 +16,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -25,242 +26,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -270,27 +86,24 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "x-number" : 0, "x-string" : "", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/parameter - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/parameter - extended.json index 8013bf06..b539a3ca 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/parameter - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/parameter - extended.json @@ -1,51 +1,7 @@ { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id", "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index c57a86b1..b62ca9b7 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -1,288 +1,28 @@ { "schemas" : { "Category" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "id" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "integer", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : "int64", - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "format" : "int64" }, "name" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "Tag" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "id" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "integer", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : "int64", - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "format" : "int64" }, "name" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "User" : { "$ref" : "#/components/schemas/user" @@ -291,288 +31,28 @@ "messages" : { "userSignup" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -585,17 +65,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -603,296 +77,59 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -906,7 +143,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "examples" : [ { "headers" : { @@ -995,8 +234,7 @@ "httpBasic" : { "type" : "http", "description" : "http", - "scheme" : "basic", - "bearerFormat" : null + "scheme" : "basic" }, "httpBearer" : { "type" : "http", @@ -1027,51 +265,7 @@ "parameter" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" }, @@ -1104,6 +298,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -1113,242 +308,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -1358,173 +368,41 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } } }, "messageTraits" : { "userSignup" : { "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -1537,17 +415,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -1555,296 +427,59 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -1858,7 +493,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "examples" : [ { "headers" : { @@ -1882,21 +519,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -1905,8 +543,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -1914,21 +551,24 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "channelBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -1943,32 +583,29 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -1981,8 +618,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { }, "kafka" : { @@ -2003,6 +639,7 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -2012,8 +649,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { }, "sns" : { }, @@ -2021,218 +657,31 @@ "sqs" : { }, "stomp" : { }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } }, "operationBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -2242,242 +691,57 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { }, "redis" : { }, "sns" : { }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -2487,320 +751,80 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "messageBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { }, "mqtt" : { @@ -2814,7 +838,9 @@ "solace" : { }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "x-number" : 0, "x-string" : "", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index 9d151fa2..cfdb63ab 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -6,13 +6,9 @@ "variables" : { "username" : { "description" : "This value is assigned by the service provider, in this example `gigantic-server.com`", - "examples" : null, - "enum" : null, "default" : "demo" }, "port" : { - "description" : null, - "examples" : null, "enum" : [ "8883", "8884" ], "default" : "8883" } @@ -26,21 +22,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -49,8 +46,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -58,18 +54,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "x-number" : 0, "x-string" : "", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 8109084e..97d54c5e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -25,13 +25,9 @@ "variables" : { "username" : { "description" : "This value is assigned by the service provider, in this example `gigantic-server.com`", - "examples" : null, - "enum" : null, "default" : "demo" }, "port" : { - "description" : null, - "examples" : null, "enum" : [ "8883", "8884" ], "default" : "8883" }, @@ -44,8 +40,7 @@ } ], "tags" : [ { "name" : "env:staging", - "description" : "This environment is a replica of the production environment", - "externalDocs" : null + "description" : "This environment is a replica of the production environment" } ], "bindings" : { "amqp" : { @@ -56,21 +51,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -79,8 +75,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -88,18 +83,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } }, "stage-2" : { @@ -132,6 +129,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -141,8 +139,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -154,112 +151,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -270,122 +176,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -397,6 +209,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -406,23 +219,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -457,6 +265,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -466,8 +275,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -479,112 +287,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -595,122 +312,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -722,6 +345,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -731,23 +355,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -766,288 +385,28 @@ }, { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -1060,17 +419,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -1078,300 +431,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1450,6 +566,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -1459,8 +576,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -1472,112 +588,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -1588,122 +613,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -1715,6 +646,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -1724,23 +656,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -1775,6 +702,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -1784,8 +712,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -1797,112 +724,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -1913,122 +749,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -2040,6 +782,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -2049,23 +792,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -2081,288 +819,28 @@ "message" : { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -2375,17 +853,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -2393,300 +865,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2747,57 +982,14 @@ "userId" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" } }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -2812,36 +1004,33 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -2854,8 +1043,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -2886,6 +1074,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -2895,8 +1084,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -2914,504 +1102,55 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } - }, - "$ref" : null + } } }, "components" : { "schemas" : { "Category" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "id" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "integer", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : "int64", - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "format" : "int64" }, "name" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "Tag" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "id" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "integer", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : "int64", - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "format" : "int64" }, "name" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "User" : { "$ref" : "#/components/schemas/user" @@ -3426,13 +1165,9 @@ "variables" : { "username" : { "description" : "This value is assigned by the service provider, in this example `gigantic-server.com`", - "examples" : null, - "enum" : null, "default" : "demo" }, "port" : { - "description" : null, - "examples" : null, "enum" : [ "8883", "8884" ], "default" : "8883" }, @@ -3445,8 +1180,7 @@ } ], "tags" : [ { "name" : "env:staging", - "description" : "This environment is a replica of the production environment", - "externalDocs" : null + "description" : "This environment is a replica of the production environment" } ], "bindings" : { "amqp" : { @@ -3457,21 +1191,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -3480,8 +1215,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -3489,18 +1223,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } }, "mqtt-stage" : { @@ -3543,6 +1279,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -3552,8 +1289,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -3565,112 +1301,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -3681,122 +1326,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -3808,6 +1359,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -3817,23 +1369,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -3868,6 +1415,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -3877,8 +1425,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -3890,112 +1437,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4006,122 +1462,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4133,6 +1495,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4142,23 +1505,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4177,288 +1535,28 @@ }, { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -4471,17 +1569,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -4489,300 +1581,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -4861,6 +1716,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4870,8 +1726,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4883,112 +1738,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4999,122 +1763,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -5126,6 +1796,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -5135,23 +1806,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -5186,6 +1852,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -5195,8 +1862,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -5208,112 +1874,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -5324,122 +1899,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -5451,6 +1932,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -5460,23 +1942,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -5492,288 +1969,28 @@ "message" : { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -5786,17 +2003,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -5804,300 +2015,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6158,57 +2132,14 @@ "userId" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" } }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -6223,36 +2154,33 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -6265,8 +2193,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -6297,6 +2224,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -6306,8 +2234,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -6325,505 +2252,56 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } - }, - "$ref" : null + } } }, "messages" : { "userSignup" : { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -6836,17 +2314,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -6854,300 +2326,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7272,8 +2507,7 @@ "httpBasic" : { "type" : "http", "description" : "http", - "scheme" : "basic", - "bearerFormat" : null + "scheme" : "basic" }, "httpBearer" : { "type" : "http", @@ -7304,51 +2538,7 @@ "parameterWithSchema" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" }, @@ -7394,6 +2584,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -7403,8 +2594,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -7416,112 +2606,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -7532,122 +2631,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -7659,6 +2664,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -7668,23 +2674,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -7705,146 +2706,17 @@ "userSignup" : { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -7857,17 +2729,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -7875,300 +2741,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -8234,21 +2863,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -8257,8 +2887,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -8266,21 +2895,24 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "channelBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -8295,36 +2927,33 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -8337,8 +2966,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -8369,6 +2997,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -8378,8 +3007,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -8397,218 +3025,31 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } }, "operationBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -8618,8 +3059,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -8631,112 +3071,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -8747,122 +3096,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -8874,6 +3129,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -8883,23 +3139,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -8913,300 +3164,63 @@ }, "messageBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json index 81545797..2c8ac817 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json @@ -22,6 +22,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -31,8 +32,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -44,112 +44,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -160,122 +69,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -287,6 +102,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -296,23 +112,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -347,6 +158,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -356,8 +168,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -369,112 +180,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -485,122 +205,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -612,6 +238,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -621,23 +248,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -656,288 +278,28 @@ }, { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -950,17 +312,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -968,300 +324,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1340,6 +459,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -1349,8 +469,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -1362,112 +481,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -1478,122 +506,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -1605,6 +539,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -1614,23 +549,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -1665,6 +595,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -1674,8 +605,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -1687,112 +617,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -1803,122 +642,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -1930,6 +675,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -1939,23 +685,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -1971,288 +712,28 @@ "message" : { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -2265,17 +746,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -2283,300 +758,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2637,57 +875,14 @@ "userId" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" } }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -2702,36 +897,33 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -2744,8 +936,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -2776,6 +967,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -2785,8 +977,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -2804,217 +995,28 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } }, - "$ref" : null, "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json index 00ff8fd4..4400042c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json @@ -1,288 +1,28 @@ { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -295,17 +35,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -313,300 +47,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json index eb118fe5..eb2abc06 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json @@ -1,146 +1,17 @@ { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -153,17 +24,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -171,300 +36,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json index b62d429d..1b1ad060 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json @@ -19,6 +19,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -28,8 +29,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -41,112 +41,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -157,122 +66,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -284,6 +99,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -293,23 +109,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -344,6 +155,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -353,8 +165,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -366,112 +177,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -482,122 +202,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -609,6 +235,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -618,23 +245,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -650,288 +272,28 @@ "message" : { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -944,17 +306,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -962,300 +318,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json index 2ddef9ce..0ee336e6 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json @@ -19,6 +19,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -28,8 +29,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -41,112 +41,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -157,122 +66,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -284,6 +99,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -293,23 +109,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -344,6 +155,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -353,8 +165,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -366,112 +177,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -482,122 +202,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -609,6 +235,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -618,23 +245,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -653,288 +275,28 @@ }, { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -947,17 +309,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -965,300 +321,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json index eb19969a..a92725a4 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json @@ -19,6 +19,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -28,8 +29,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -41,112 +41,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -157,122 +66,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -284,6 +99,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -293,23 +109,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -344,6 +155,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -353,8 +165,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -366,112 +177,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -482,122 +202,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -609,6 +235,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -618,23 +245,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json index ba4ea333..80f7e485 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json @@ -19,6 +19,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -28,8 +29,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -41,112 +41,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -157,122 +66,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -284,6 +99,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -293,23 +109,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/parameter with schema - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/parameter with schema - extended.json index 8013bf06..b539a3ca 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/parameter with schema - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/parameter with schema - extended.json @@ -1,51 +1,7 @@ { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id", "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 6a3c1ba9..86e6aa0b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -1,288 +1,28 @@ { "schemas" : { "Category" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "id" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "integer", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : "int64", - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "format" : "int64" }, "name" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "Tag" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "id" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "integer", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : "int64", - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "format" : "int64" }, "name" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "User" : { "$ref" : "#/components/schemas/user" @@ -297,13 +37,9 @@ "variables" : { "username" : { "description" : "This value is assigned by the service provider, in this example `gigantic-server.com`", - "examples" : null, - "enum" : null, "default" : "demo" }, "port" : { - "description" : null, - "examples" : null, "enum" : [ "8883", "8884" ], "default" : "8883" }, @@ -316,8 +52,7 @@ } ], "tags" : [ { "name" : "env:staging", - "description" : "This environment is a replica of the production environment", - "externalDocs" : null + "description" : "This environment is a replica of the production environment" } ], "bindings" : { "amqp" : { @@ -328,21 +63,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -351,8 +87,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -360,18 +95,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } }, "mqtt-stage" : { @@ -414,6 +151,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -423,8 +161,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -436,112 +173,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -552,122 +198,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -679,6 +231,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -688,23 +241,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -739,6 +287,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -748,8 +297,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -761,112 +309,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -877,122 +334,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -1004,6 +367,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -1013,23 +377,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -1048,288 +407,28 @@ }, { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -1342,17 +441,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -1360,300 +453,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1732,6 +588,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -1741,8 +598,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -1754,112 +610,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -1870,122 +635,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -1997,6 +668,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -2006,23 +678,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -2057,6 +724,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -2066,8 +734,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -2079,112 +746,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -2195,122 +771,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -2322,6 +804,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -2331,23 +814,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -2363,288 +841,28 @@ "message" : { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -2657,17 +875,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -2675,300 +887,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3029,57 +1004,14 @@ "userId" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" } }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -3094,36 +1026,33 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -3136,8 +1065,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -3168,6 +1096,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -3177,8 +1106,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -3196,505 +1124,56 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } - }, - "$ref" : null + } } }, "messages" : { "userSignup" : { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "payload" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "user" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/userCreate", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/userCreate" }, "signup" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : "#/components/schemas/signup", - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "$ref" : "#/components/schemas/signup" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -3707,17 +1186,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -3725,300 +1198,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -4143,8 +1379,7 @@ "httpBasic" : { "type" : "http", "description" : "http", - "scheme" : "basic", - "bearerFormat" : null + "scheme" : "basic" }, "httpBearer" : { "type" : "http", @@ -4175,51 +1410,7 @@ "parameterWithSchema" : { "description" : "Id of the user.", "schema" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "location" : "$message.payload#/user/id" }, @@ -4265,6 +1456,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4274,8 +1466,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4287,112 +1478,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4403,122 +1503,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4530,6 +1536,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4539,23 +1546,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4576,146 +1578,17 @@ "userSignup" : { "messageId" : "userSignup", "headers" : { - "title" : null, - "description" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, "type" : "object", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "title" : null, "description" : "Correlation ID set by application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" }, "applicationInstanceId" : { - "title" : null, "description" : "Unique identifier for a given instance of the publishing application", - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "type" : "string", - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + "type" : "string" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null, - "default" : null, - "$ref" : null, - "enum" : null, - "const" : null, - "if" : null, - "then" : null, - "else" : null + } }, "correlationId" : { "description" : "Default Correlation ID", @@ -4728,17 +1601,11 @@ "summary" : "Action to sign a user up.", "description" : "A longer description", "tags" : [ { - "name" : "user", - "description" : null, - "externalDocs" : null + "name" : "user" }, { - "name" : "signup", - "description" : null, - "externalDocs" : null + "name" : "signup" }, { - "name" : "register", - "description" : null, - "externalDocs" : null + "name" : "register" } ], "externalDocs" : { "description" : "User sign up rules", @@ -4746,300 +1613,63 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5105,21 +1735,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -5128,8 +1759,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -5137,21 +1767,24 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "channelBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -5166,36 +1799,33 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", - "labels" : null, "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] }, "schemaSettings" : { "encoding" : "binary", - "firstRevisionId" : null, - "lastRevisionId" : null, "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -5208,8 +1838,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -5240,6 +1869,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -5249,8 +1879,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -5268,218 +1897,31 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "ref" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Referral.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Referral." } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + } }, "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Authentication" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Authentication token", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Authentication token" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } } }, "operationBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -5489,8 +1931,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -5502,112 +1943,21 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, "required" : [ "companyId" ], "properties" : { "companyId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "number", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, "minimum" : 1, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "The Id of the company.", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "The Id of the company." } }, - "patternProperties" : null, - "additionalProperties" : false, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + "additionalProperties" : false + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -5618,122 +1968,28 @@ "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myGroupId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myGroupId" ] }, "clientId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myClientId" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myClientId" ] } }, "mercure" : { "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -5745,6 +2001,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -5754,23 +2011,18 @@ "accessType" : "exclusive", "maxMsgSpoolSize" : "1,500", "maxTtl" : "60" - }, - "topic" : null + } }, { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "topicSubscriptions" : [ "person/*/updated" ] }, "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -5784,300 +2036,63 @@ }, "messageBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "correlationId" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : "Correlation ID set by application", - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "description" : "Correlation ID set by application" } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.0.1" + } + } }, "googlepubsub" : { - "orderingKey" : null, - "attributes" : null, + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "object", - "enum" : null, - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, "properties" : { "Content-Type" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "application/json" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "application/json" ] } - }, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null - }, - "bindingVersion" : "0.1.0" + } + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { - "$id" : null, - "$schema" : null, - "$ref" : null, - "$comment" : null, "type" : "string", - "enum" : [ "myKey" ], - "const" : null, - "multipleOf" : null, - "maximum" : null, - "exclusiveMaximum" : null, - "minimum" : null, - "exclusiveMinimum" : null, - "maxLength" : null, - "minLength" : null, - "pattern" : null, - "items" : null, - "additionalItems" : null, - "maxItems" : null, - "minItems" : null, - "uniqueItems" : null, - "contains" : null, - "maxProperties" : null, - "minProperties" : null, - "required" : null, - "properties" : null, - "patternProperties" : null, - "additionalProperties" : null, - "dependencies" : null, - "propertyNames" : null, - "if" : null, - "then" : null, - "else" : null, - "allOf" : null, - "anyOf" : null, - "oneOf" : null, - "not" : null, - "format" : null, - "contentEncoding" : null, - "contentMediaType" : null, - "definitions" : null, - "title" : null, - "description" : null, - "default" : null, - "readOnly" : null, - "writeOnly" : null, - "examples" : null, - "discriminator" : null, - "externalDocs" : null, - "deprecated" : null + "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index d6988852..12a11e84 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -6,13 +6,9 @@ "variables" : { "username" : { "description" : "This value is assigned by the service provider, in this example `gigantic-server.com`", - "examples" : null, - "enum" : null, "default" : "demo" }, "port" : { - "description" : null, - "examples" : null, "enum" : [ "8883", "8884" ], "default" : "8883" }, @@ -25,8 +21,7 @@ } ], "tags" : [ { "name" : "env:staging", - "description" : "This environment is a replica of the production environment", - "externalDocs" : null + "description" : "This environment is a replica of the production environment" } ], "bindings" : { "amqp" : { @@ -37,21 +32,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -60,8 +56,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -69,18 +64,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "x-number" : 0, "x-string" : "", diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic - extended.json b/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic - extended.json index f41e4c2c..5477e747 100644 --- a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic - extended.json @@ -2,7 +2,6 @@ "type" : "http", "description" : "http", "scheme" : "basic", - "bearerFormat" : null, "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 28da7797..57070621 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -78,21 +78,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -101,8 +102,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -110,18 +110,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } }, "server 2" : { @@ -175,21 +177,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -198,8 +201,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -207,18 +209,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } }, "server 3" : { @@ -288,14 +292,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -304,17 +309,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -323,28 +328,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -421,14 +425,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -437,17 +442,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -456,28 +461,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -554,14 +558,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -570,17 +575,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -589,28 +594,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -701,14 +705,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -717,17 +722,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -736,28 +741,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -873,14 +877,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -889,17 +894,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -908,28 +913,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1006,14 +1010,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1022,17 +1027,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1041,28 +1046,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1139,14 +1143,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1155,17 +1160,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1174,28 +1179,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1286,14 +1290,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1302,17 +1307,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1321,28 +1326,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1437,14 +1441,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1453,17 +1458,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1472,28 +1477,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1570,14 +1574,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1586,17 +1591,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1605,28 +1610,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1703,14 +1707,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1719,17 +1724,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1738,28 +1743,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1850,14 +1854,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1866,17 +1871,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1885,28 +1890,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1987,6 +1991,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -2001,18 +2006,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -2021,13 +2026,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -2040,8 +2045,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -2072,6 +2076,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -2081,8 +2086,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -2100,6 +2104,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -2118,8 +2123,7 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "tags" : [ { @@ -2205,14 +2209,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2221,17 +2226,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2240,28 +2245,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2338,14 +2342,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2354,17 +2359,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2373,28 +2378,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2471,14 +2475,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2487,17 +2492,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2506,28 +2511,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2618,14 +2622,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2634,17 +2639,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2653,28 +2658,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2790,14 +2794,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2806,17 +2811,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2825,28 +2830,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2923,14 +2927,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2939,17 +2944,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2958,28 +2963,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3056,14 +3060,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3072,17 +3077,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3091,28 +3096,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3203,14 +3207,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3219,17 +3224,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3238,28 +3243,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3354,14 +3358,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3370,17 +3375,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3389,28 +3394,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3487,14 +3491,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3503,17 +3508,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3522,28 +3527,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3620,14 +3624,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3636,17 +3641,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3655,28 +3660,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3767,14 +3771,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3783,17 +3788,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3802,28 +3807,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3904,6 +3908,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -3918,18 +3923,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -3938,13 +3943,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -3957,8 +3962,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -3989,6 +3993,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -3998,8 +4003,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -4017,6 +4021,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -4035,8 +4040,7 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "tags" : [ { @@ -4095,6 +4099,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4104,8 +4109,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4117,6 +4121,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4130,8 +4135,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4154,16 +4158,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4175,6 +4179,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4195,8 +4200,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4235,6 +4239,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4244,8 +4249,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4257,6 +4261,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4270,8 +4275,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4294,16 +4298,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4315,6 +4319,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4335,8 +4340,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4374,6 +4378,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4383,8 +4388,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4396,6 +4400,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4409,8 +4414,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4433,16 +4437,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4454,6 +4458,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4474,8 +4479,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4544,6 +4548,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4553,8 +4558,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4566,6 +4570,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4579,8 +4584,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4603,16 +4607,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4624,6 +4628,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4644,8 +4649,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4684,6 +4688,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4693,8 +4698,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4706,6 +4710,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4719,8 +4724,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4743,16 +4747,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4764,6 +4768,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4784,8 +4789,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4823,6 +4827,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4832,8 +4837,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4845,6 +4849,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4858,8 +4863,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4882,16 +4886,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4903,6 +4907,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4923,8 +4928,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -5036,21 +5040,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -5059,8 +5064,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -5068,18 +5072,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } }, "mqtt-stage" : { @@ -5160,14 +5166,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5176,17 +5183,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5195,28 +5202,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5293,14 +5299,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5309,17 +5316,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5328,28 +5335,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5426,14 +5432,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5442,17 +5449,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5461,28 +5468,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5573,14 +5579,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5589,17 +5596,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5608,28 +5615,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5745,14 +5751,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5761,17 +5768,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5780,28 +5787,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5878,14 +5884,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5894,17 +5901,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5913,28 +5920,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6011,14 +6017,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6027,17 +6034,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6046,28 +6053,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6158,14 +6164,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6174,17 +6181,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6193,28 +6200,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6309,14 +6315,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6325,17 +6332,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6344,28 +6351,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6442,14 +6448,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6458,17 +6465,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6477,28 +6484,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6575,14 +6581,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6591,17 +6598,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6610,28 +6617,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6722,14 +6728,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6738,17 +6745,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6757,28 +6764,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6859,6 +6865,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -6873,18 +6880,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -6893,13 +6900,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -6912,8 +6919,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -6944,6 +6950,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -6953,8 +6960,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -6972,6 +6978,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -6990,8 +6997,7 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "tags" : [ { @@ -7077,14 +7083,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7093,17 +7100,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7112,28 +7119,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7210,14 +7216,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7226,17 +7233,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7245,28 +7252,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7343,14 +7349,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7359,17 +7366,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7378,28 +7385,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7490,14 +7496,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7506,17 +7513,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7525,28 +7532,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7662,14 +7668,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7678,17 +7685,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7697,28 +7704,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7795,14 +7801,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7811,17 +7818,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7830,28 +7837,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7928,14 +7934,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7944,17 +7951,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7963,28 +7970,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -8075,14 +8081,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -8091,17 +8098,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -8110,28 +8117,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -8226,14 +8232,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -8242,17 +8249,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -8261,28 +8268,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -8359,14 +8365,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -8375,17 +8382,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -8394,28 +8401,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -8492,14 +8498,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -8508,17 +8515,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -8527,28 +8534,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -8639,14 +8645,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -8655,17 +8662,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -8674,28 +8681,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -8776,6 +8782,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -8790,18 +8797,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -8810,13 +8817,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -8829,8 +8836,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -8861,6 +8867,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -8870,8 +8877,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -8889,6 +8895,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -8907,8 +8914,7 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "tags" : [ { @@ -8967,6 +8973,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -8976,8 +8983,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -8989,6 +8995,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -9002,8 +9009,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -9026,16 +9032,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -9047,6 +9053,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -9067,8 +9074,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -9107,6 +9113,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -9116,8 +9123,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -9129,6 +9135,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -9142,8 +9149,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -9166,16 +9172,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -9187,6 +9193,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -9207,8 +9214,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -9246,6 +9252,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -9255,8 +9262,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -9268,6 +9274,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -9281,8 +9288,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -9305,16 +9311,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -9326,6 +9332,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -9346,8 +9353,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -9416,6 +9422,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -9425,8 +9432,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -9438,6 +9444,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -9451,8 +9458,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -9475,16 +9481,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -9496,6 +9502,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -9516,8 +9523,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -9556,6 +9562,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -9565,8 +9572,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -9578,6 +9584,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -9591,8 +9598,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -9615,16 +9621,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -9636,6 +9642,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -9656,8 +9663,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -9695,6 +9701,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -9704,8 +9711,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -9717,6 +9723,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -9730,8 +9737,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -9754,16 +9760,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -9775,6 +9781,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -9795,8 +9802,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -9906,14 +9912,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -9922,17 +9929,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -9941,28 +9948,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -10039,14 +10045,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -10055,17 +10062,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -10074,28 +10081,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -10172,14 +10178,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -10188,17 +10195,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -10207,28 +10214,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -10319,14 +10325,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -10335,17 +10342,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -10354,28 +10361,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -10491,14 +10497,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -10507,17 +10514,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -10526,28 +10533,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -10624,14 +10630,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -10640,17 +10647,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -10659,28 +10666,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -10757,14 +10763,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -10773,17 +10780,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -10792,28 +10799,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -10904,14 +10910,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -10920,17 +10927,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -10939,28 +10946,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -11055,14 +11061,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -11071,17 +11078,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -11090,28 +11097,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -11188,14 +11194,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -11204,17 +11211,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -11223,28 +11230,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -11321,14 +11327,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -11337,17 +11344,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -11356,28 +11363,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -11468,14 +11474,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -11484,17 +11491,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -11503,28 +11510,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -11749,6 +11755,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -11758,8 +11765,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -11771,6 +11777,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -11784,8 +11791,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -11808,16 +11814,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -11829,6 +11835,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -11849,8 +11856,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -11889,6 +11895,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -11898,8 +11905,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -11911,6 +11917,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -11924,8 +11931,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -11948,16 +11954,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -11969,6 +11975,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -11989,8 +11996,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -12033,14 +12039,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -12049,17 +12056,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -12068,28 +12075,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -12180,14 +12186,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -12196,17 +12203,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -12215,28 +12222,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -12315,14 +12321,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -12331,17 +12338,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -12350,28 +12357,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -12449,21 +12455,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -12472,8 +12479,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -12481,21 +12487,24 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "channelBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -12510,18 +12519,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -12530,13 +12539,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -12549,8 +12558,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -12581,6 +12589,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -12590,8 +12599,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -12609,6 +12617,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -12627,12 +12636,12 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "operationBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -12642,8 +12651,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -12655,6 +12663,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -12668,8 +12677,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -12692,16 +12700,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -12713,6 +12721,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -12733,8 +12742,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -12748,14 +12756,15 @@ }, "messageBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -12764,17 +12773,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -12783,28 +12792,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json index a74df3c7..475e2a67 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json @@ -60,14 +60,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -76,17 +77,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -95,28 +96,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -193,14 +193,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -209,17 +210,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -228,28 +229,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -326,14 +326,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -342,17 +343,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -361,28 +362,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -473,14 +473,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -489,17 +490,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -508,28 +509,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -645,14 +645,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -661,17 +662,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -680,28 +681,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -778,14 +778,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -794,17 +795,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -813,28 +814,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -911,14 +911,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -927,17 +928,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -946,28 +947,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1058,14 +1058,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1074,17 +1075,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1093,28 +1094,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1209,14 +1209,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1225,17 +1226,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1244,28 +1245,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1342,14 +1342,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1358,17 +1359,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1377,28 +1378,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1475,14 +1475,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1491,17 +1492,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1510,28 +1511,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1622,14 +1622,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1638,17 +1639,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1657,28 +1658,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1759,6 +1759,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -1773,18 +1774,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -1793,13 +1794,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -1812,8 +1813,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -1844,6 +1844,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -1853,8 +1854,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -1872,6 +1872,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -1890,8 +1891,7 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "tags" : [ { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json index 14181083..adbf036e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json @@ -60,14 +60,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -76,17 +77,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -95,28 +96,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -193,14 +193,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -209,17 +210,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -228,28 +229,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -326,14 +326,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -342,17 +343,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -361,28 +362,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -473,14 +473,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -489,17 +490,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -508,28 +509,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -645,14 +645,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -661,17 +662,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -680,28 +681,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -778,14 +778,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -794,17 +795,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -813,28 +814,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -911,14 +911,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -927,17 +928,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -946,28 +947,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1058,14 +1058,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1074,17 +1075,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1093,28 +1094,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1209,14 +1209,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1225,17 +1226,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1244,28 +1245,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1342,14 +1342,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1358,17 +1359,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1377,28 +1378,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1475,14 +1475,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1491,17 +1492,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1510,28 +1511,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1622,14 +1622,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1638,17 +1639,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1657,28 +1658,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1759,6 +1759,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -1773,18 +1774,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -1793,13 +1794,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -1812,8 +1813,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -1844,6 +1844,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -1853,8 +1854,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -1872,6 +1872,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -1890,8 +1891,7 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "tags" : [ { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json index 4fd445a2..6957cd9c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json @@ -32,14 +32,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -48,17 +49,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -67,28 +68,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -165,14 +165,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -181,17 +182,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -200,28 +201,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -298,14 +298,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -314,17 +315,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -333,28 +334,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -445,14 +445,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -461,17 +462,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -480,28 +481,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json index 188d3afd..8853685d 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json @@ -37,14 +37,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -53,17 +54,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -72,28 +73,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -170,14 +170,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -186,17 +187,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -205,28 +206,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -303,14 +303,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -319,17 +320,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -338,28 +339,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -450,14 +450,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -466,17 +467,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -485,28 +486,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json index 6887c72e..bf21a66b 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json @@ -15,14 +15,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -31,17 +32,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -50,28 +51,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -148,14 +148,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -164,17 +165,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -183,28 +184,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -281,14 +281,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -297,17 +298,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -316,28 +317,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -428,14 +428,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -444,17 +445,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -463,28 +464,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json index df3c310d..6a7f477e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json @@ -23,14 +23,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -39,17 +40,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -58,28 +59,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json index b46b615a..d442597e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json @@ -25,14 +25,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -41,17 +42,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -60,28 +61,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json index 13f3cffc..b1c5a9e4 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json @@ -12,14 +12,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -28,17 +29,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -47,28 +48,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index d937e849..40798ec1 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -80,21 +80,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -103,8 +104,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -112,18 +112,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } } }, "mqtt-stage" : { @@ -204,14 +206,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -220,17 +223,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -239,28 +242,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -337,14 +339,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -353,17 +356,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -372,28 +375,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -470,14 +472,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -486,17 +489,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -505,28 +508,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -617,14 +619,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -633,17 +636,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -652,28 +655,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -789,14 +791,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -805,17 +808,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -824,28 +827,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -922,14 +924,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -938,17 +941,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -957,28 +960,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1055,14 +1057,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1071,17 +1074,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1090,28 +1093,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1202,14 +1204,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1218,17 +1221,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1237,28 +1240,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1353,14 +1355,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1369,17 +1372,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1388,28 +1391,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1486,14 +1488,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1502,17 +1505,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1521,28 +1524,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1619,14 +1621,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1635,17 +1638,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1654,28 +1657,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1766,14 +1768,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -1782,17 +1785,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -1801,28 +1804,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -1903,6 +1905,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -1917,18 +1920,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -1937,13 +1940,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -1956,8 +1959,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -1988,6 +1990,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -1997,8 +2000,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -2016,6 +2018,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -2034,8 +2037,7 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "tags" : [ { @@ -2121,14 +2123,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2137,17 +2140,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2156,28 +2159,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2254,14 +2256,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2270,17 +2273,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2289,28 +2292,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2387,14 +2389,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2403,17 +2406,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2422,28 +2425,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2534,14 +2536,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2550,17 +2553,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2569,28 +2572,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2706,14 +2708,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2722,17 +2725,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2741,28 +2744,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2839,14 +2841,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2855,17 +2858,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -2874,28 +2877,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -2972,14 +2974,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -2988,17 +2991,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3007,28 +3010,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3119,14 +3121,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3135,17 +3138,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3154,28 +3157,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3270,14 +3272,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3286,17 +3289,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3305,28 +3308,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3403,14 +3405,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3419,17 +3422,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3438,28 +3441,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3536,14 +3538,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3552,17 +3555,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3571,28 +3574,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3683,14 +3685,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -3699,17 +3702,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -3718,28 +3721,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -3820,6 +3822,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -3834,18 +3837,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -3854,13 +3857,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -3873,8 +3876,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -3905,6 +3907,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -3914,8 +3917,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -3933,6 +3935,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -3951,8 +3954,7 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "tags" : [ { @@ -4011,6 +4013,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4020,8 +4023,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4033,6 +4035,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4046,8 +4049,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4070,16 +4072,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4091,6 +4093,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4111,8 +4114,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4151,6 +4153,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4160,8 +4163,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4173,6 +4175,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4186,8 +4189,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4210,16 +4212,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4231,6 +4233,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4251,8 +4254,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4290,6 +4292,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4299,8 +4302,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4312,6 +4314,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4325,8 +4328,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4349,16 +4351,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4370,6 +4372,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4390,8 +4393,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4460,6 +4462,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4469,8 +4472,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4482,6 +4484,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4495,8 +4498,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4519,16 +4521,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4540,6 +4542,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4560,8 +4563,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4600,6 +4602,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4609,8 +4612,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4622,6 +4624,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4635,8 +4638,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4659,16 +4661,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4680,6 +4682,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4700,8 +4703,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4739,6 +4741,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -4748,8 +4751,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -4761,6 +4763,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -4774,8 +4777,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -4798,16 +4800,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -4819,6 +4821,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -4839,8 +4842,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -4950,14 +4952,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -4966,17 +4969,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -4985,28 +4988,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5083,14 +5085,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5099,17 +5102,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5118,28 +5121,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5216,14 +5218,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5232,17 +5235,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5251,28 +5254,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5363,14 +5365,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5379,17 +5382,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5398,28 +5401,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5535,14 +5537,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5551,17 +5554,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5570,28 +5573,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5668,14 +5670,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5684,17 +5687,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5703,28 +5706,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5801,14 +5803,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5817,17 +5820,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5836,28 +5839,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -5948,14 +5950,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -5964,17 +5967,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -5983,28 +5986,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6099,14 +6101,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6115,17 +6118,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6134,28 +6137,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6232,14 +6234,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6248,17 +6251,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6267,28 +6270,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6365,14 +6367,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6381,17 +6384,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6400,28 +6403,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6512,14 +6514,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -6528,17 +6531,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -6547,28 +6550,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -6793,6 +6795,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -6802,8 +6805,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -6815,6 +6817,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -6828,8 +6831,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -6852,16 +6854,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -6873,6 +6875,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -6893,8 +6896,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -6933,6 +6935,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -6942,8 +6945,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -6955,6 +6957,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -6968,8 +6971,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -6992,16 +6994,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -7013,6 +7015,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -7033,8 +7036,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -7077,14 +7079,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7093,17 +7096,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7112,28 +7115,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7224,14 +7226,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7240,17 +7243,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7259,28 +7262,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7359,14 +7361,15 @@ "description" : "A longer description", "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7375,17 +7378,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7394,28 +7397,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" @@ -7493,21 +7495,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -7516,8 +7519,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -7525,21 +7527,24 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "channelBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "is" : "routingKey", "exchange" : { "name" : "myExchange", @@ -7554,18 +7559,18 @@ "exclusive" : true, "autoDelete" : false, "vhost" : "/" - }, - "bindingVersion" : "0.2.0" + } }, "amqp1" : { "$ref" : "#/components/channelBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", - "destinationType" : "exchange", - "bindingVersion" : "0.0.1" + "destinationType" : "exchange" }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "topic" : "projects/your-project/topics/topic-proto-schema", "messageRetentionDuration" : "86400s", "messageStoragePolicy" : { @@ -7574,13 +7579,13 @@ "schemaSettings" : { "encoding" : "binary", "name" : "projects/your-project/schemas/message-proto" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { "$ref" : "#/components/channelBindings/http" }, "ibmmq" : { + "bindingVersion" : "0.1.0", "destinationType" : "topic", "queue" : { "objectName" : "message", @@ -7593,8 +7598,7 @@ "durablePermitted" : true, "lastMsgRetained" : true }, - "maxMsgLength" : 1024, - "bindingVersion" : "0.1.0" + "maxMsgLength" : 1024 }, "jms" : { "$ref" : "#/components/channelBindings/jms" @@ -7625,6 +7629,7 @@ "$ref" : "#/components/channelBindings/nats" }, "pulsar" : { + "bindingVersion" : "0.1.0", "namespace" : "staging", "persistence" : "persistent", "compaction" : 1000, @@ -7634,8 +7639,7 @@ "size" : 1000 }, "ttl" : 360, - "deduplication" : false, - "bindingVersion" : "0.1.0" + "deduplication" : false }, "redis" : { "$ref" : "#/components/channelBindings/redis" @@ -7653,6 +7657,7 @@ "$ref" : "#/components/channelBindings/stomp" }, "ws" : { + "bindingVersion" : "0.1.0", "method" : "GET", "query" : { "type" : "object", @@ -7671,12 +7676,12 @@ "description" : "Authentication token" } } - }, - "bindingVersion" : "0.1.0" + } } }, "operationBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -7686,8 +7691,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -7699,6 +7703,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -7712,8 +7717,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -7736,16 +7740,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -7757,6 +7761,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -7777,8 +7782,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -7792,14 +7796,15 @@ }, "messageBindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "contentEncoding" : "gzip", - "messageType" : "user.signup", - "bindingVersion" : "0.2.0" + "messageType" : "user.signup" }, "amqp1" : { "$ref" : "#/components/messageBindings/amqp1" }, "anypointmq" : { + "bindingVersion" : "0.0.1", "headers" : { "type" : "object", "properties" : { @@ -7808,17 +7813,17 @@ "description" : "Correlation ID set by application" } } - }, - "bindingVersion" : "0.0.1" + } }, "googlepubsub" : { + "bindingVersion" : "0.1.0", "schema" : { "name" : "projects/your-project/schemas/message-avro", "type" : "avro" - }, - "bindingVersion" : "0.1.0" + } }, "http" : { + "bindingVersion" : "0.1.0", "headers" : { "type" : "object", "properties" : { @@ -7827,28 +7832,27 @@ "enum" : [ "application/json" ] } } - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { + "bindingVersion" : "0.1.0", "type" : "jms", "headers" : "Content-Type: application/json", "description" : "JMS stream message", - "expiry" : 0, - "bindingVersion" : "0.1.0" + "expiry" : 0 }, "jms" : { "$ref" : "#/components/messageBindings/jms" }, "kafka" : { + "bindingVersion" : "0.4.0", "key" : { "type" : "string", "enum" : [ "myKey" ] }, "schemaIdLocation" : "payload", "schemaIdPayloadEncoding" : "apicurio-new", - "schemaLookupStrategy" : "TopicIdStrategy", - "bindingVersion" : "0.4.0" + "schemaLookupStrategy" : "TopicIdStrategy" }, "mercure" : { "$ref" : "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json index 76102126..b71bfc14 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json @@ -29,6 +29,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -38,8 +39,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -51,6 +51,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -64,8 +65,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -88,16 +88,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -109,6 +109,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -129,8 +130,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -169,6 +169,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -178,8 +179,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -191,6 +191,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -204,8 +205,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -228,16 +228,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -249,6 +249,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -269,8 +270,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -308,6 +308,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -317,8 +318,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -330,6 +330,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -343,8 +344,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -367,16 +367,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -388,6 +388,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -408,8 +409,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json index 6526f625..0b58575d 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json @@ -28,6 +28,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -37,8 +38,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -50,6 +50,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -63,8 +64,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -87,16 +87,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -108,6 +108,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -128,8 +129,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -168,6 +168,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -177,8 +178,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -190,6 +190,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -203,8 +204,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -227,16 +227,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -248,6 +248,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -268,8 +269,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" @@ -307,6 +307,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -316,8 +317,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -329,6 +329,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -342,8 +343,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -366,16 +366,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -387,6 +387,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -407,8 +408,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json index b12fa47a..0a70810e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json @@ -25,6 +25,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -34,8 +35,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -47,6 +47,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -60,8 +61,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -84,16 +84,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -105,6 +105,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -125,8 +126,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json index 4cb84973..d863472c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json @@ -24,6 +24,7 @@ }, "bindings" : { "amqp" : { + "bindingVersion" : "0.2.0", "expiration" : 100000, "userId" : "guest", "cc" : [ "user.logs" ], @@ -33,8 +34,7 @@ "bcc" : [ "external.audit" ], "replyTo" : "user.signedup", "timestamp" : true, - "ack" : false, - "bindingVersion" : "0.2.0" + "ack" : false }, "amqp1" : { "$ref" : "#/components/operationBindings/amqp1" @@ -46,6 +46,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { + "bindingVersion" : "0.1.0", "type" : "request", "method" : "GET", "query" : { @@ -59,8 +60,7 @@ } }, "additionalProperties" : false - }, - "bindingVersion" : "0.1.0" + } }, "ibmmq" : { "$ref" : "#/components/operationBindings/ibmmq" @@ -83,16 +83,16 @@ "$ref" : "#/components/operationBindings/mercure" }, "mqtt" : { + "bindingVersion" : "0.1.0", "qos" : 2, - "retain" : true, - "bindingVersion" : "0.1.0" + "retain" : true }, "mqtt5" : { "$ref" : "#/components/operationBindings/mqtt5" }, "nats" : { - "queue" : "messages", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "queue" : "messages" }, "pulsar" : { "$ref" : "#/components/operationBindings/pulsar" @@ -104,6 +104,7 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { + "bindingVersion" : "0.3.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", @@ -124,8 +125,7 @@ "topic" : { "topicSubscriptions" : [ "person/*/updated" ] } - } ], - "bindingVersion" : "0.3.0" + } ] }, "sqs" : { "$ref" : "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 8345f9cf..320da9c6 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -46,21 +46,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -69,8 +70,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -78,18 +78,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "x-number" : 0, "x-string" : "", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 544037d4..63529cd1 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -49,21 +49,22 @@ "googlepubsub" : { }, "http" : { }, "ibmmq" : { + "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", "ccdtQueueManagerName" : "*", "cipherSpec" : "ANY_TLS12_OR_HIGHER", "multiEndpointServer" : false, - "heartBeatInterval" : 300, - "bindingVersion" : "0.1.0" + "heartBeatInterval" : 300 }, "jms" : { }, "kafka" : { + "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", - "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "schemaRegistryVendor" : "confluent" }, "mercure" : { }, "mqtt" : { + "bindingVersion" : "0.1.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { @@ -72,8 +73,7 @@ "message" : "Guest gone offline.", "retain" : false }, - "keepAlive" : 60, - "bindingVersion" : "0.1.0" + "keepAlive" : 60 }, "mqtt5" : { "sessionExpiryInterval" : 60, @@ -81,18 +81,20 @@ }, "nats" : { }, "pulsar" : { - "tenant" : "contoso", - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.1.0", + "tenant" : "contoso" }, "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net" }, "sqs" : { }, "stomp" : { }, - "ws" : { } + "ws" : { + "bindingVersion" : "0.1.0" + } }, "x-number" : 0, "x-string" : "", From f72a2f0382b06349a98870f30871dadb2a518f34 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 25 Apr 2024 00:44:05 +0400 Subject: [PATCH 037/141] feat(bindings): STOMP 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/182 --- .../bindings/stomp/STOMPChannelBinding.java | 36 +++++++ .../bindings/stomp/STOMPMessageBinding.java | 36 +++++++ .../bindings/stomp/STOMPOperationBinding.java | 36 +++++++ .../bindings/stomp/STOMPServerBinding.java | 36 +++++++ .../v0/_1_0/channel/STOMPChannelBinding.java | 19 +++- .../v0/_1_0/message/STOMPMessageBinding.java | 19 +++- .../_1_0/operation/STOMPOperationBinding.java | 19 +++- .../v0/_1_0/server/STOMPServerBinding.java | 19 +++- .../com/asyncapi/bindings/BindingsTest.java | 5 + .../asyncapi/bindings/stomp/STOMPTest.java | 100 ++++++++++++++++++ .../stomp/_1_0/STOMPBindingProvider.java | 26 +++++ .../_1_0/channel/STOMPChannelBindingTest.java | 42 ++++++++ .../_1_0/message/STOMPMessageBindingTest.java | 40 +++++++ .../operation/STOMPOperationBindingTest.java | 40 +++++++ .../_1_0/server/STOMPServerBindingTest.java | 40 +++++++ .../channel/STOMPChannelBindingTest.java | 42 ++++++++ .../message/STOMPMessageBindingTest.java | 40 +++++++ .../operation/STOMPOperationBindingTest.java | 40 +++++++ .../latest/server/STOMPServerBindingTest.java | 40 +++++++ .../channel/STOMPChannelBindingTest.java | 42 ++++++++ .../message/STOMPMessageBindingTest.java | 40 +++++++ .../operation/STOMPOperationBindingTest.java | 40 +++++++ .../server/STOMPServerBindingTest.java | 40 +++++++ .../channel/STOMPChannelBindingTest.java | 42 ++++++++ .../message/STOMPMessageBindingTest.java | 40 +++++++ .../operation/STOMPOperationBindingTest.java | 40 +++++++ .../server/STOMPServerBindingTest.java | 40 +++++++ .../0.1.0/channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../bindings/stomp/0.1.0/channel/binding.json | 3 + .../0.1.0/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../bindings/stomp/0.1.0/message/binding.json | 3 + .../0.1.0/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../stomp/0.1.0/operation/binding.json | 3 + .../0.1.0/server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../bindings/stomp/0.1.0/server/binding.json | 3 + .../latest/channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../stomp/latest/channel/binding.json | 3 + .../latest/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../stomp/latest/message/binding.json | 3 + .../latest/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../stomp/latest/operation/binding.json | 3 + .../latest/server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../bindings/stomp/latest/server/binding.json | 3 + .../channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../unknown version/channel/binding.json | 3 + .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../unknown version/message/binding.json | 3 + .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../unknown version/operation/binding.json | 3 + .../server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../stomp/unknown version/server/binding.json | 3 + .../channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 8 ++ .../without version/channel/binding.json | 1 + .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 8 ++ .../without version/message/binding.json | 1 + .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 8 ++ .../without version/operation/binding.json | 1 + .../server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 8 ++ .../stomp/without version/server/binding.json | 1 + .../v2/2.0.0/model/asyncapi - extended.json | 56 +++++++--- .../model/channel/channelItem - extended.json | 24 +++-- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 12 ++- ... with reference to message - extended.json | 8 +- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 28 +++-- .../2.0.0/model/server/server - extended.json | 4 +- .../v2/2.6.0/model/asyncapi - extended.json | 12 ++- .../components/components - extended.json | 8 +- .../2.6.0/model/server/server - extended.json | 4 +- .../v3/3.0.0/model/asyncapi - extended.json | 16 ++- .../components/components - extended.json | 8 +- .../3.0.0/model/server/server - extended.json | 4 +- .../server with reference - extended.json | 4 +- 91 files changed, 1449 insertions(+), 58 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/STOMPBindingProvider.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/channel/STOMPChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/message/STOMPMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/operation/STOMPOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/server/STOMPServerBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java new file mode 100644 index 00000000..6d3aae50 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java @@ -0,0 +1,36 @@ +package com.asyncapi.bindings.stomp; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes STOMP channel binding. + * + * @version 0.1.0 + * @see STOMP channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class STOMPChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java new file mode 100644 index 00000000..951fdfdd --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java @@ -0,0 +1,36 @@ +package com.asyncapi.bindings.stomp; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes STOMP message binding. + * + * @version 0.1.0 + * @see STOMP message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class STOMPMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java new file mode 100644 index 00000000..e9fd5b03 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java @@ -0,0 +1,36 @@ +package com.asyncapi.bindings.stomp; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes STOMP operation binding. + * + * @version 0.1.0 + * @see STOMP operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class STOMPOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java new file mode 100644 index 00000000..b6097373 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java @@ -0,0 +1,36 @@ +package com.asyncapi.bindings.stomp; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes STOMP server binding. + * + * @version 0.1.0 + * @see STOMP server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class STOMPServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java index 2045091e..28493c1d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -17,7 +18,21 @@ * @author Pavel Bodiachevskii */ @Data -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class STOMPChannelBinding extends ChannelBinding { +public class STOMPChannelBinding extends com.asyncapi.bindings.stomp.STOMPChannelBinding { + + public STOMPChannelBinding() { + this.setBindingVersion("0.1.0"); + } + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java index 43812418..5aad2ea7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -17,7 +18,21 @@ * @author Pavel Bodiachevskii */ @Data -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class STOMPMessageBinding extends MessageBinding { +public class STOMPMessageBinding extends com.asyncapi.bindings.stomp.STOMPMessageBinding { + + public STOMPMessageBinding() { + this.setBindingVersion("0.1.0"); + } + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java index b4d15373..713ee10c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -17,7 +18,21 @@ * @author Pavel Bodiachevskii */ @Data -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class STOMPOperationBinding extends OperationBinding { +public class STOMPOperationBinding extends com.asyncapi.bindings.stomp.STOMPOperationBinding { + + public STOMPOperationBinding() { + this.setBindingVersion("0.1.0"); + } + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java index 42b65412..af66ba51 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -17,7 +18,21 @@ * @author Pavel Bodiachevskii */ @Data -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class STOMPServerBinding extends ServerBinding { +public class STOMPServerBinding extends com.asyncapi.bindings.stomp.STOMPServerBinding { + + public STOMPServerBinding() { + this.setBindingVersion("0.1.0"); + } + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java index be55796a..96aeddea 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java @@ -1,5 +1,6 @@ package com.asyncapi.bindings; +import com.asyncapi.bindings.stomp.STOMPTest; import com.asyncapi.bindings.websockets.WebSocketsTest; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -7,6 +8,10 @@ @DisplayName("Bindings") public class BindingsTest { + @Nested + @DisplayName("STOMP") + class STOMP extends STOMPTest {} + @Nested @DisplayName("WebSockets") class WebSockets extends WebSocketsTest {} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java new file mode 100644 index 00000000..87e14c01 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java @@ -0,0 +1,100 @@ +package com.asyncapi.bindings.stomp; + +import com.asyncapi.bindings.stomp._1_0.channel.STOMPChannelBindingTest; +import com.asyncapi.bindings.stomp._1_0.message.STOMPMessageBindingTest; +import com.asyncapi.bindings.stomp._1_0.operation.STOMPOperationBindingTest; +import com.asyncapi.bindings.stomp._1_0.server.STOMPServerBindingTest; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +public abstract class STOMPTest { + + @Nested + @DisplayName("unknown version") + class UnknownVersion { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.stomp.latest.channel.STOMPChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.stomp.latest.message.STOMPMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.stomp.latest.operation.STOMPOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.stomp.latest.server.STOMPServerBindingTest {} + + } + + @Nested + @DisplayName("without version") + class WithoutVersion { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.stomp.withoutversion.channel.STOMPChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.stomp.withoutversion.message.STOMPMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.stomp.withoutversion.operation.STOMPOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.stomp.withoutversion.server.STOMPServerBindingTest {} + + } + + @Nested + @DisplayName("latest") + class Latest { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.stomp.latest.channel.STOMPChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.stomp.latest.message.STOMPMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.stomp.latest.operation.STOMPOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.stomp.latest.server.STOMPServerBindingTest {} + + } + + @Nested + @DisplayName("0.1.0") + class V0_1_0 { + + @Nested + @DisplayName("channel") + class Channel extends STOMPChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends STOMPMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends STOMPOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends STOMPServerBindingTest {} + + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/STOMPBindingProvider.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/STOMPBindingProvider.java new file mode 100644 index 00000000..43966b86 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/STOMPBindingProvider.java @@ -0,0 +1,26 @@ +package com.asyncapi.bindings.stomp._1_0; + +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; + +public class STOMPBindingProvider { + + public static STOMPChannelBinding channel() { + return new STOMPChannelBinding(); + } + + public static STOMPMessageBinding message() { + return new STOMPMessageBinding(); + } + + public static STOMPOperationBinding operation() { + return new STOMPOperationBinding(); + } + + public static STOMPServerBinding server() { + return new STOMPServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/channel/STOMPChannelBindingTest.java new file mode 100644 index 00000000..332e329b --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/channel/STOMPChannelBindingTest.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.stomp._1_0.channel; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Nested; + +@Nested +public abstract class STOMPChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/0.1.0/channel/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/0.1.0/channel/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/0.1.0/channel/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPChannelBinding build() { + return STOMPBindingProvider.channel(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/message/STOMPMessageBindingTest.java new file mode 100644 index 00000000..ad703feb --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/message/STOMPMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp._1_0.message; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/0.1.0/message/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/0.1.0/message/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/0.1.0/message/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPMessageBinding build() { + return STOMPBindingProvider.message(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/operation/STOMPOperationBindingTest.java new file mode 100644 index 00000000..2ec8132e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/operation/STOMPOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp._1_0.operation; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/0.1.0/operation/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/0.1.0/operation/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/0.1.0/operation/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPOperationBinding build() { + return STOMPBindingProvider.operation(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/server/STOMPServerBindingTest.java new file mode 100644 index 00000000..2aa5b9e6 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/server/STOMPServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp._1_0.server; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/0.1.0/server/webSocketsServerBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java new file mode 100644 index 00000000..ea935842 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.stomp.latest.channel; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Nested; + +@Nested +public abstract class STOMPChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/latest/channel/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/latest/channel/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/latest/channel/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPChannelBinding build() { + return STOMPBindingProvider.channel(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java new file mode 100644 index 00000000..c2451216 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp.latest.message; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/latest/message/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/latest/message/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/latest/message/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPMessageBinding build() { + return STOMPBindingProvider.message(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java new file mode 100644 index 00000000..bfaa0499 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp.latest.operation; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/latest/operation/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/latest/operation/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/latest/operation/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPOperationBinding build() { + return STOMPBindingProvider.operation(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java new file mode 100644 index 00000000..a9c81e75 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp.latest.server; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/latest/server/webSocketsServerBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/latest/server/webSocketsServerBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java new file mode 100644 index 00000000..f3d2fd87 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.stomp.unknownversion.channel; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Nested; + +@Nested +public abstract class STOMPChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/unknown version/channel/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/unknown version/channel/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/unknown version/channel/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPChannelBinding build() { + return STOMPBindingProvider.channel(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java new file mode 100644 index 00000000..75f218bd --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp.unknownversion.message; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/without version/message/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/without version/message/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/without version/message/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPMessageBinding build() { + return STOMPBindingProvider.message(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java new file mode 100644 index 00000000..e97f37bf --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp.unknownversion.operation; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/without version/operation/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/without version/operation/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/without version/operation/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPOperationBinding build() { + return STOMPBindingProvider.operation(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java new file mode 100644 index 00000000..1034f074 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp.unknownversion.server; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/without version/server/webSocketsServerBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/without version/server/webSocketsServerBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java new file mode 100644 index 00000000..e12d2e1f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.stomp.withoutversion.channel; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Nested; + +@Nested +public abstract class STOMPChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/without version/channel/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/without version/channel/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/without version/channel/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPChannelBinding build() { + return STOMPBindingProvider.channel(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java new file mode 100644 index 00000000..8d5ec799 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp.withoutversion.message; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/without version/message/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/without version/message/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/without version/message/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPMessageBinding build() { + return STOMPBindingProvider.message(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java new file mode 100644 index 00000000..21c6c05b --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp.withoutversion.operation; + +import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/stomp/without version/operation/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/stomp/without version/operation/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/stomp/without version/operation/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPOperationBinding build() { + return STOMPBindingProvider.operation(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java new file mode 100644 index 00000000..bc6e0152 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.stomp.withoutversion.server; + +import com.asyncapi.ExtendableObject; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return WebSocketsServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/websockets/without version/server/webSocketsServerBinding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/websockets/without version/server/webSocketsServerBinding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json"; + } + + @NotNull + @Override + public ExtendableObject build() { + return new WebSocketsServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 4ef8cbc0..4cf6af90 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -84,7 +84,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -196,7 +198,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -305,7 +309,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -417,7 +423,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -526,7 +534,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -645,7 +655,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -767,7 +779,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0", "method" : "GET", @@ -937,7 +951,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -1177,7 +1193,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -1287,7 +1305,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -1356,7 +1376,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -1450,7 +1472,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0", "method" : "GET", @@ -1560,7 +1584,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -1632,7 +1658,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 69c351b6..cb83162e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -102,7 +102,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -211,7 +213,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -323,7 +327,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -432,7 +438,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -551,7 +559,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -673,7 +683,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0", "method" : "GET", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index b832d79b..526a4f01 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -111,7 +111,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 7caac6e1..5fa95054 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -100,7 +100,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index aa5768ea..9876351f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -100,7 +100,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -209,7 +211,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -328,7 +332,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index 449cd6d9..a8a7dc0f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -100,7 +100,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -209,7 +211,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index cc042b31..e0f5d9ac 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -100,7 +100,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index b62ca9b7..5d663e33 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -142,7 +142,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -382,7 +384,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -492,7 +496,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -561,7 +567,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -655,7 +663,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0", "method" : "GET", @@ -765,7 +775,9 @@ } ] }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -837,7 +849,9 @@ "sns" : { }, "solace" : { }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index cfdb63ab..686d5c96 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -64,7 +64,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 97d54c5e..bdd6f83b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -93,7 +93,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -1233,7 +1235,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -2905,7 +2909,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 86e6aa0b..b73c64a0 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -105,7 +105,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -1777,7 +1779,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 12a11e84..38dcdecc 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -74,7 +74,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 57070621..01a2b72c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -120,7 +120,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -219,7 +221,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -5082,7 +5086,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -12497,7 +12503,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index 40798ec1..f0809a82 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -122,7 +122,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } @@ -7537,7 +7539,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 320da9c6..93fd15f5 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -88,7 +88,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 63529cd1..bcbcac71 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -91,7 +91,9 @@ "msgVpn" : "solace.private.net" }, "sqs" : { }, - "stomp" : { }, + "stomp" : { + "bindingVersion" : "0.1.0" + }, "ws" : { "bindingVersion" : "0.1.0" } From 5d807b56367f6da8ebee3388e0171c6b8b2cf92c Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 25 Apr 2024 01:16:40 +0400 Subject: [PATCH 038/141] feat(bindings): Redis 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/178 --- .../bindings/redis/RedisChannelBinding.java | 33 +++++++ .../bindings/redis/RedisMessageBinding.java | 33 +++++++ .../bindings/redis/RedisOperationBinding.java | 33 +++++++ .../bindings/redis/RedisServerBinding.java | 33 +++++++ .../v0/_1_0/channel/RedisChannelBinding.java | 15 ++- .../v0/_1_0/message/RedisMessageBinding.java | 15 ++- .../_1_0/operation/RedisOperationBinding.java | 15 ++- .../v0/_1_0/server/RedisServerBinding.java | 15 ++- .../com/asyncapi/bindings/BindingsTest.java | 5 + .../asyncapi/bindings/redis/RedisTest.java | 96 +++++++++++++++++++ .../channel/RedisChannelBindingTest.java | 42 ++++++++ .../message/RedisMessageBindingTest.java | 40 ++++++++ .../operation/RedisOperationBindingTest.java | 40 ++++++++ .../latest/server/RedisServerBindingTest.java | 40 ++++++++ .../channel/RedisChannelBindingTest.java | 42 ++++++++ .../message/RedisMessageBindingTest.java | 40 ++++++++ .../operation/RedisOperationBindingTest.java | 40 ++++++++ .../server/RedisServerBindingTest.java | 40 ++++++++ .../redis/v0/_1_0/RedisBindingProvider.java | 27 ++++++ .../_1_0/channel/RedisChannelBindingTest.java | 41 ++++++++ .../_1_0/message/RedisMessageBindingTest.java | 39 ++++++++ .../operation/RedisOperationBindingTest.java | 39 ++++++++ .../_1_0/server/RedisServerBindingTest.java | 39 ++++++++ .../channel/RedisChannelBindingTest.java | 42 ++++++++ .../message/RedisMessageBindingTest.java | 40 ++++++++ .../operation/RedisOperationBindingTest.java | 40 ++++++++ .../server/RedisServerBindingTest.java | 40 ++++++++ .../0.1.0/channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../0.1.0/channel/binding.json | 3 + .../0.1.0/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../0.1.0/message/binding.json | 3 + .../0.1.0/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../0.1.0/operation/binding.json | 3 + .../0.1.0/server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../0.1.0/server/binding.json | 3 + .../latest/channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../latest/channel/binding.json | 3 + .../latest/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../latest/message/binding.json | 3 + .../latest/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../latest/operation/binding.json | 3 + .../latest/server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../latest/server/binding.json | 3 + .../channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../unknown version/channel/binding.json | 3 + .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../unknown version/message/binding.json | 3 + .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../unknown version/operation/binding.json | 3 + .../server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../unknown version/server/binding.json | 3 + .../channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 8 ++ .../without version/channel/binding.json | 1 + .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 8 ++ .../without version/message/binding.json | 1 + .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 8 ++ .../without version/operation/binding.json | 1 + .../server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 8 ++ .../without version/server/binding.json | 1 + .../v2/2.0.0/model/asyncapi - extended.json | 56 ++++++++--- .../model/channel/channelItem - extended.json | 24 +++-- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 12 ++- ... with reference to message - extended.json | 8 +- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 28 ++++-- .../2.0.0/model/server/server - extended.json | 4 +- .../v2/2.6.0/model/asyncapi - extended.json | 12 ++- .../components/components - extended.json | 8 +- .../2.6.0/model/server/server - extended.json | 4 +- .../v3/3.0.0/model/asyncapi - extended.json | 16 +++- .../components/components - extended.json | 8 +- .../3.0.0/model/server/server - extended.json | 4 +- .../server with reference - extended.json | 4 +- 91 files changed, 1414 insertions(+), 58 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/channel/RedisChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/message/RedisMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/operation/RedisOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/server/RedisServerBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/channel/RedisChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/message/RedisMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/operation/RedisOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/server/RedisServerBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/RedisBindingProvider.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/channel/RedisChannelBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/message/RedisMessageBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/operation/RedisOperationBindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/server/RedisServerBindingTest.java create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisChannelBinding.java new file mode 100644 index 00000000..b4e868d5 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisChannelBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.redis; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Redis channel binding. + * + * @version 0.1.0 + * @see Redis channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class RedisChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisMessageBinding.java new file mode 100644 index 00000000..f889cbc3 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisMessageBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.redis; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Redis message binding. + * + * @version 0.1.0 + * @see Redis message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class RedisMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisOperationBinding.java new file mode 100644 index 00000000..616cd1cc --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisOperationBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.redis; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Redis operation binding. + * + * @version 0.1.0 + * @see Redis operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class RedisOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisServerBinding.java new file mode 100644 index 00000000..c7b9cfa3 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisServerBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.redis; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Redis server binding. + * + * @version 0.1.0 + * @see Redis server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class RedisServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java index c48d1ba4..9c283a4e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.redis.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class RedisChannelBinding extends ChannelBinding { +public class RedisChannelBinding extends com.asyncapi.bindings.redis.RedisChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java index 207fc019..b364611e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.redis.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class RedisMessageBinding extends MessageBinding { +public class RedisMessageBinding extends com.asyncapi.bindings.redis.RedisMessageBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java index 0391cefa..f311da04 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.redis.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class RedisOperationBinding extends OperationBinding { +public class RedisOperationBinding extends com.asyncapi.bindings.redis.RedisOperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java index 0b7c7a1f..4b3f4aee 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.redis.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class RedisServerBinding extends ServerBinding { +public class RedisServerBinding extends com.asyncapi.bindings.redis.RedisServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java index 96aeddea..3ea2c57f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java @@ -1,5 +1,6 @@ package com.asyncapi.bindings; +import com.asyncapi.bindings.redis.RedisTest; import com.asyncapi.bindings.stomp.STOMPTest; import com.asyncapi.bindings.websockets.WebSocketsTest; import org.junit.jupiter.api.DisplayName; @@ -8,6 +9,10 @@ @DisplayName("Bindings") public class BindingsTest { + @Nested + @DisplayName("Redis") + class Redis extends RedisTest {} + @Nested @DisplayName("STOMP") class STOMP extends STOMPTest {} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisTest.java new file mode 100644 index 00000000..ff378658 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisTest.java @@ -0,0 +1,96 @@ +package com.asyncapi.bindings.redis; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +public abstract class RedisTest { + + @Nested + @DisplayName("unknown version") + class UnknownVersion { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.redis.unknownversion.channel.RedisChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.redis.unknownversion.message.RedisMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.redis.unknownversion.operation.RedisOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.redis.unknownversion.server.RedisServerBindingTest {} + + } + + @Nested + @DisplayName("without version") + class WithoutVersion { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.redis.withoutversion.channel.RedisChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.redis.withoutversion.message.RedisMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.redis.withoutversion.operation.RedisOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.redis.withoutversion.server.RedisServerBindingTest {} + + } + + @Nested + @DisplayName("latest") + class Latest { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.redis.latest.channel.RedisChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.redis.latest.message.RedisMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.redis.latest.operation.RedisOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.redis.latest.server.RedisServerBindingTest {} + + } + + @Nested + @DisplayName("0.1.0") + class V0_1_0 { + + @Nested + @DisplayName("channel") + class Channel extends com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBindingTest {} + + @Nested + @DisplayName("message") + class Message extends com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBindingTest {} + + @Nested + @DisplayName("operation") + class Operation extends com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBindingTest {} + + @Nested + @DisplayName("server") + class Server extends com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBindingTest {} + + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/channel/RedisChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/channel/RedisChannelBindingTest.java new file mode 100644 index 00000000..f2fbabe2 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/channel/RedisChannelBindingTest.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.redis.latest.channel; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Nested; + +@Nested +public abstract class RedisChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/latest/channel/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/latest/channel/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/latest/channel/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisChannelBinding build() { + return RedisBindingProvider.channel(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/message/RedisMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/message/RedisMessageBindingTest.java new file mode 100644 index 00000000..832eb115 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/message/RedisMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.redis.latest.message; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/latest/message/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/latest/message/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/latest/message/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisMessageBinding build() { + return RedisBindingProvider.message(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/operation/RedisOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/operation/RedisOperationBindingTest.java new file mode 100644 index 00000000..3467e0c1 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/operation/RedisOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.redis.latest.operation; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/latest/operation/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/latest/operation/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/latest/operation/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisOperationBinding build() { + return RedisBindingProvider.operation(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/server/RedisServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/server/RedisServerBindingTest.java new file mode 100644 index 00000000..849441d1 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/server/RedisServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.redis.latest.server; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/latest/server/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/latest/server/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/latest/server/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisServerBinding build() { + return RedisBindingProvider.server(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/channel/RedisChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/channel/RedisChannelBindingTest.java new file mode 100644 index 00000000..f33a3d36 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/channel/RedisChannelBindingTest.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.redis.unknownversion.channel; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Nested; + +@Nested +public abstract class RedisChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/unknown version/channel/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/unknown version/channel/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisChannelBinding build() { + return RedisBindingProvider.channel(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/message/RedisMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/message/RedisMessageBindingTest.java new file mode 100644 index 00000000..a75fd89d --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/message/RedisMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.redis.unknownversion.message; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/unknown version/message/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/unknown version/message/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisMessageBinding build() { + return RedisBindingProvider.message(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/operation/RedisOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/operation/RedisOperationBindingTest.java new file mode 100644 index 00000000..86bcd1d8 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/operation/RedisOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.redis.unknownversion.operation; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/unknown version/operation/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/unknown version/operation/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisOperationBinding build() { + return RedisBindingProvider.operation(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/server/RedisServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/server/RedisServerBindingTest.java new file mode 100644 index 00000000..2ac35f3d --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/server/RedisServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.redis.unknownversion.server; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/unknown version/server/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/unknown version/server/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisServerBinding build() { + return RedisBindingProvider.server(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/RedisBindingProvider.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/RedisBindingProvider.java new file mode 100644 index 00000000..fc431efd --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/RedisBindingProvider.java @@ -0,0 +1,27 @@ +package com.asyncapi.bindings.redis.v0._1_0; + + +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; + +public class RedisBindingProvider { + + public static RedisChannelBinding channel() { + return new RedisChannelBinding(); + } + + public static RedisMessageBinding message() { + return new RedisMessageBinding(); + } + + public static RedisOperationBinding operation() { + return new RedisOperationBinding(); + } + + public static RedisServerBinding server() { + return new RedisServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBindingTest.java new file mode 100644 index 00000000..92eddb66 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBindingTest.java @@ -0,0 +1,41 @@ +package com.asyncapi.bindings.redis.v0._1_0.channel; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Nested; + +@Nested +public abstract class RedisChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/0.1.0/channel/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/0.1.0/channel/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisChannelBinding build() { + return RedisBindingProvider.channel(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBindingTest.java new file mode 100644 index 00000000..ce756349 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBindingTest.java @@ -0,0 +1,39 @@ +package com.asyncapi.bindings.redis.v0._1_0.message; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/0.1.0/message/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/0.1.0/message/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisMessageBinding build() { + return RedisBindingProvider.message(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBindingTest.java new file mode 100644 index 00000000..5c94c0b1 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBindingTest.java @@ -0,0 +1,39 @@ +package com.asyncapi.bindings.redis.v0._1_0.operation; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/0.1.0/operation/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/0.1.0/operation/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisOperationBinding build() { + return RedisBindingProvider.operation(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBindingTest.java new file mode 100644 index 00000000..07df8c8c --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBindingTest.java @@ -0,0 +1,39 @@ +package com.asyncapi.bindings.redis.v0._1_0.server; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/0.1.0/server/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/0.1.0/server/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisServerBinding build() { + return RedisBindingProvider.server(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/channel/RedisChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/channel/RedisChannelBindingTest.java new file mode 100644 index 00000000..d10ff8c3 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/channel/RedisChannelBindingTest.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.redis.withoutversion.channel; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Nested; + +@Nested +public abstract class RedisChannelBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisChannelBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/without version/channel/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/without version/channel/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/without version/channel/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisChannelBinding build() { + return RedisBindingProvider.channel(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/message/RedisMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/message/RedisMessageBindingTest.java new file mode 100644 index 00000000..c6a28ed2 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/message/RedisMessageBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.redis.withoutversion.message; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisMessageBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisMessageBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/without version/message/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/without version/message/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/without version/message/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisMessageBinding build() { + return RedisBindingProvider.message(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/operation/RedisOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/operation/RedisOperationBindingTest.java new file mode 100644 index 00000000..a59f2690 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/operation/RedisOperationBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.redis.withoutversion.operation; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisOperationBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisOperationBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/without version/operation/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/without version/operation/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisOperationBinding build() { + return RedisBindingProvider.operation(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/server/RedisServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/server/RedisServerBindingTest.java new file mode 100644 index 00000000..aa66407b --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/server/RedisServerBindingTest.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.redis.withoutversion.server; + +import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class RedisServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return RedisServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/without version/server/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/without version/server/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/without version/server/binding - wrongly extended.json"; + } + + @NotNull + @Override + public RedisServerBinding build() { + return RedisBindingProvider.server(); + } + +} diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/0.1.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/latest/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/unknown version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/channel/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/message/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/operation/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/default implementation/without version/server/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 4cf6af90..6b3e3aae 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -77,7 +77,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -171,7 +173,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -282,7 +286,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -396,7 +402,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -507,7 +515,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -651,7 +661,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, @@ -775,7 +787,9 @@ "ttl" : 360, "deduplication" : false }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, @@ -947,7 +961,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, @@ -1166,7 +1182,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -1301,7 +1319,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, @@ -1369,7 +1389,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -1468,7 +1490,9 @@ "ttl" : 360, "deduplication" : false }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, @@ -1557,7 +1581,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -1654,7 +1680,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index cb83162e..552eb27c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -75,7 +75,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -186,7 +188,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -300,7 +304,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -411,7 +417,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -555,7 +563,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, @@ -679,7 +689,9 @@ "ttl" : 360, "deduplication" : false }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 526a4f01..d2efbcc0 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -107,7 +107,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 5fa95054..f11a4fe1 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -96,7 +96,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 9876351f..d35aa263 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -73,7 +73,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -184,7 +186,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -328,7 +332,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index a8a7dc0f..dc4a7c33 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -73,7 +73,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -184,7 +186,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index e0f5d9ac..1d67359c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -73,7 +73,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 5d663e33..9989eedd 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -138,7 +138,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, @@ -357,7 +359,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -492,7 +496,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, @@ -560,7 +566,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -659,7 +667,9 @@ "ttl" : 360, "deduplication" : false }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, @@ -748,7 +758,9 @@ "queue" : "messages" }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -845,7 +857,9 @@ "mqtt5" : { }, "nats" : { }, "pulsar" : { }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { }, "sqs" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index 686d5c96..f44f011d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -57,7 +57,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index bdd6f83b..b1674d21 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -86,7 +86,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -1228,7 +1230,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -2902,7 +2906,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index b73c64a0..065c5ff7 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -98,7 +98,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -1772,7 +1774,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 38dcdecc..65e7b11e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -67,7 +67,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 01a2b72c..4007e1d8 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -113,7 +113,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -214,7 +216,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -5079,7 +5083,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -12496,7 +12502,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index f0809a82..86547eec 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -115,7 +115,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", @@ -7532,7 +7534,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 93fd15f5..032156a5 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -81,7 +81,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index bcbcac71..6b6bdbd6 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -84,7 +84,9 @@ "bindingVersion" : "0.1.0", "tenant" : "contoso" }, - "redis" : { }, + "redis" : { + "bindingVersion" : "0.1.0" + }, "sns" : { }, "solace" : { "bindingVersion" : "0.3.0", From ee6d885bdf26393dad79185345f883809c14ef24 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 25 Apr 2024 01:27:19 +0400 Subject: [PATCH 039/141] tests(bindings): STOMP 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/182 --- .../asyncapi/bindings/stomp/STOMPTest.java | 20 ++++------ .../_1_0/server/STOMPServerBindingTest.java | 40 ------------------- .../channel/STOMPChannelBindingTest.java | 8 ++-- .../message/STOMPMessageBindingTest.java | 8 ++-- .../operation/STOMPOperationBindingTest.java | 8 ++-- .../latest/server/STOMPServerBindingTest.java | 19 +++++---- .../channel/STOMPChannelBindingTest.java | 8 ++-- .../message/STOMPMessageBindingTest.java | 8 ++-- .../operation/STOMPOperationBindingTest.java | 8 ++-- .../server/STOMPServerBindingTest.java | 19 +++++---- .../{ => v0}/_1_0/STOMPBindingProvider.java | 2 +- .../_1_0/channel/STOMPChannelBindingTest.java | 11 +++-- .../_1_0/message/STOMPMessageBindingTest.java | 11 +++-- .../operation/STOMPOperationBindingTest.java | 11 +++-- .../_1_0/server/STOMPServerBindingTest.java | 39 ++++++++++++++++++ .../channel/STOMPChannelBindingTest.java | 8 ++-- .../message/STOMPMessageBindingTest.java | 8 ++-- .../operation/STOMPOperationBindingTest.java | 8 ++-- .../server/STOMPServerBindingTest.java | 19 +++++---- .../0.1.0/channel/binding - extended.json | 8 ---- .../channel/binding - wrongly extended.json | 9 ----- .../bindings/stomp/0.1.0/channel/binding.json | 3 -- .../0.1.0/message/binding - extended.json | 8 ---- .../message/binding - wrongly extended.json | 9 ----- .../bindings/stomp/0.1.0/message/binding.json | 3 -- .../0.1.0/operation/binding - extended.json | 8 ---- .../operation/binding - wrongly extended.json | 9 ----- .../stomp/0.1.0/operation/binding.json | 3 -- .../0.1.0/server/binding - extended.json | 8 ---- .../server/binding - wrongly extended.json | 9 ----- .../bindings/stomp/0.1.0/server/binding.json | 3 -- .../latest/channel/binding - extended.json | 8 ---- .../channel/binding - wrongly extended.json | 9 ----- .../stomp/latest/channel/binding.json | 3 -- .../latest/message/binding - extended.json | 8 ---- .../message/binding - wrongly extended.json | 9 ----- .../stomp/latest/message/binding.json | 3 -- .../latest/operation/binding - extended.json | 8 ---- .../operation/binding - wrongly extended.json | 9 ----- .../stomp/latest/operation/binding.json | 3 -- .../latest/server/binding - extended.json | 8 ---- .../server/binding - wrongly extended.json | 9 ----- .../bindings/stomp/latest/server/binding.json | 3 -- .../channel/binding - extended.json | 8 ---- .../channel/binding - wrongly extended.json | 9 ----- .../unknown version/channel/binding.json | 3 -- .../message/binding - extended.json | 8 ---- .../message/binding - wrongly extended.json | 9 ----- .../unknown version/message/binding.json | 3 -- .../operation/binding - extended.json | 8 ---- .../operation/binding - wrongly extended.json | 9 ----- .../unknown version/operation/binding.json | 3 -- .../server/binding - extended.json | 8 ---- .../server/binding - wrongly extended.json | 9 ----- .../stomp/unknown version/server/binding.json | 3 -- .../channel/binding - extended.json | 8 ---- .../channel/binding - wrongly extended.json | 8 ---- .../without version/channel/binding.json | 1 - .../message/binding - extended.json | 8 ---- .../message/binding - wrongly extended.json | 8 ---- .../without version/message/binding.json | 1 - .../operation/binding - extended.json | 8 ---- .../operation/binding - wrongly extended.json | 8 ---- .../without version/operation/binding.json | 1 - .../server/binding - extended.json | 8 ---- .../server/binding - wrongly extended.json | 8 ---- .../stomp/without version/server/binding.json | 1 - 67 files changed, 126 insertions(+), 445 deletions(-) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/server/STOMPServerBindingTest.java rename asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/{ => v0}/_1_0/STOMPBindingProvider.java (94%) rename asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/{ => v0}/_1_0/channel/STOMPChannelBindingTest.java (63%) rename asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/{ => v0}/_1_0/message/STOMPMessageBindingTest.java (62%) rename asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/{ => v0}/_1_0/operation/STOMPOperationBindingTest.java (62%) create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBindingTest.java delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - wrongly extended.json delete mode 100644 asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding.json diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java index 87e14c01..0b10e67f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java @@ -1,9 +1,5 @@ package com.asyncapi.bindings.stomp; -import com.asyncapi.bindings.stomp._1_0.channel.STOMPChannelBindingTest; -import com.asyncapi.bindings.stomp._1_0.message.STOMPMessageBindingTest; -import com.asyncapi.bindings.stomp._1_0.operation.STOMPOperationBindingTest; -import com.asyncapi.bindings.stomp._1_0.server.STOMPServerBindingTest; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -15,19 +11,19 @@ class UnknownVersion { @Nested @DisplayName("channel") - class Channel extends com.asyncapi.bindings.stomp.latest.channel.STOMPChannelBindingTest {} + class Channel extends com.asyncapi.bindings.stomp.unknownversion.channel.STOMPChannelBindingTest {} @Nested @DisplayName("message") - class Message extends com.asyncapi.bindings.stomp.latest.message.STOMPMessageBindingTest {} + class Message extends com.asyncapi.bindings.stomp.unknownversion.message.STOMPMessageBindingTest {} @Nested @DisplayName("operation") - class Operation extends com.asyncapi.bindings.stomp.latest.operation.STOMPOperationBindingTest {} + class Operation extends com.asyncapi.bindings.stomp.unknownversion.operation.STOMPOperationBindingTest {} @Nested @DisplayName("server") - class Server extends com.asyncapi.bindings.stomp.latest.server.STOMPServerBindingTest {} + class Server extends com.asyncapi.bindings.stomp.unknownversion.server.STOMPServerBindingTest {} } @@ -81,19 +77,19 @@ class V0_1_0 { @Nested @DisplayName("channel") - class Channel extends STOMPChannelBindingTest {} + class Channel extends com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBindingTest {} @Nested @DisplayName("message") - class Message extends STOMPMessageBindingTest {} + class Message extends com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBindingTest {} @Nested @DisplayName("operation") - class Operation extends STOMPOperationBindingTest {} + class Operation extends com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBindingTest {} @Nested @DisplayName("server") - class Server extends STOMPServerBindingTest {} + class Server extends com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBindingTest {} } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/server/STOMPServerBindingTest.java deleted file mode 100644 index 2aa5b9e6..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/server/STOMPServerBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.stomp._1_0.server; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/0.1.0/server/webSocketsServerBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java index ea935842..07e4499a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.stomp.latest.channel; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -18,19 +18,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/latest/channel/binding.json"; + return "/bindings/default implementation/latest/channel/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/latest/channel/binding - extended.json"; + return "/bindings/default implementation/latest/channel/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/latest/channel/binding - wrongly extended.json"; + return "/bindings/default implementation/latest/channel/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java index c2451216..3a5fd07f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.stomp.latest.message; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -16,19 +16,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/latest/message/binding.json"; + return "/bindings/default implementation/latest/message/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/latest/message/binding - extended.json"; + return "/bindings/default implementation/latest/message/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/latest/message/binding - wrongly extended.json"; + return "/bindings/default implementation/latest/message/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java index bfaa0499..7b8784ba 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.stomp.latest.operation; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -16,19 +16,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/latest/operation/binding.json"; + return "/bindings/default implementation/latest/operation/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/latest/operation/binding - extended.json"; + return "/bindings/default implementation/latest/operation/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/latest/operation/binding - wrongly extended.json"; + return "/bindings/default implementation/latest/operation/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java index a9c81e75..014abbdf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java @@ -1,40 +1,39 @@ package com.asyncapi.bindings.stomp.latest.server; -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; -public abstract class STOMPServerBindingTest extends SerDeTest { +public abstract class STOMPServerBindingTest extends SerDeTest { @NotNull @Override - protected Class objectClass() { - return WebSocketsServerBinding.class; + protected Class objectClass() { + return STOMPServerBinding.class; } @NotNull @Override protected String baseObjectJson() { - return "/bindings/websockets/latest/server/webSocketsServerBinding.json"; + return "/bindings/default implementation/latest/server/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/websockets/latest/server/webSocketsServerBinding - extended.json"; + return "/bindings/default implementation/latest/server/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json"; + return "/bindings/default implementation/latest/server/binding - wrongly extended.json"; } @NotNull @Override - public ExtendableObject build() { - return new WebSocketsServerBinding(); + public STOMPServerBinding build() { + return new STOMPServerBinding(); } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java index f3d2fd87..7fea27d2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.stomp.unknownversion.channel; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -18,19 +18,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/unknown version/channel/binding.json"; + return "/bindings/default implementation/unknown version/channel/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/unknown version/channel/binding - extended.json"; + return "/bindings/default implementation/unknown version/channel/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/unknown version/channel/binding - wrongly extended.json"; + return "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java index 75f218bd..28509d86 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.stomp.unknownversion.message; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -16,19 +16,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/without version/message/binding.json"; + return "/bindings/default implementation/without version/message/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/without version/message/binding - extended.json"; + return "/bindings/default implementation/without version/message/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/without version/message/binding - wrongly extended.json"; + return "/bindings/default implementation/without version/message/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java index e97f37bf..e539368f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.stomp.unknownversion.operation; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -16,19 +16,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/without version/operation/binding.json"; + return "/bindings/default implementation/without version/operation/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/without version/operation/binding - extended.json"; + return "/bindings/default implementation/without version/operation/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/without version/operation/binding - wrongly extended.json"; + return "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java index 1034f074..3c436d51 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java @@ -1,40 +1,39 @@ package com.asyncapi.bindings.stomp.unknownversion.server; -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; -public abstract class STOMPServerBindingTest extends SerDeTest { +public abstract class STOMPServerBindingTest extends SerDeTest { @NotNull @Override - protected Class objectClass() { - return WebSocketsServerBinding.class; + protected Class objectClass() { + return STOMPServerBinding.class; } @NotNull @Override protected String baseObjectJson() { - return "/bindings/websockets/without version/server/webSocketsServerBinding.json"; + return "/bindings/default implementation/without version/server/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/websockets/without version/server/webSocketsServerBinding - extended.json"; + return "/bindings/default implementation/without version/server/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json"; + return "/bindings/default implementation/without version/server/binding - wrongly extended.json"; } @NotNull @Override - public ExtendableObject build() { - return new WebSocketsServerBinding(); + public STOMPServerBinding build() { + return new STOMPServerBinding(); } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/STOMPBindingProvider.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/STOMPBindingProvider.java similarity index 94% rename from asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/STOMPBindingProvider.java rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/STOMPBindingProvider.java index 43966b86..c40ff9b8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/STOMPBindingProvider.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/STOMPBindingProvider.java @@ -1,4 +1,4 @@ -package com.asyncapi.bindings.stomp._1_0; +package com.asyncapi.bindings.stomp.v0._1_0; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBindingTest.java similarity index 63% rename from asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/channel/STOMPChannelBindingTest.java rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBindingTest.java index 332e329b..2bb1c1f6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/channel/STOMPChannelBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBindingTest.java @@ -1,7 +1,6 @@ -package com.asyncapi.bindings.stomp._1_0.channel; +package com.asyncapi.bindings.stomp.v0._1_0.channel; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Nested; @@ -18,19 +17,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/0.1.0/channel/binding.json"; + return "/bindings/default implementation/0.1.0/channel/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/0.1.0/channel/binding - extended.json"; + return "/bindings/default implementation/0.1.0/channel/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/0.1.0/channel/binding - wrongly extended.json"; + return "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBindingTest.java similarity index 62% rename from asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/message/STOMPMessageBindingTest.java rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBindingTest.java index ad703feb..485281c9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/message/STOMPMessageBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBindingTest.java @@ -1,7 +1,6 @@ -package com.asyncapi.bindings.stomp._1_0.message; +package com.asyncapi.bindings.stomp.v0._1_0.message; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -16,19 +15,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/0.1.0/message/binding.json"; + return "/bindings/default implementation/0.1.0/message/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/0.1.0/message/binding - extended.json"; + return "/bindings/default implementation/0.1.0/message/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/0.1.0/message/binding - wrongly extended.json"; + return "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBindingTest.java similarity index 62% rename from asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/operation/STOMPOperationBindingTest.java rename to asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBindingTest.java index 2ec8132e..5821f72d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/_1_0/operation/STOMPOperationBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBindingTest.java @@ -1,7 +1,6 @@ -package com.asyncapi.bindings.stomp._1_0.operation; +package com.asyncapi.bindings.stomp.v0._1_0.operation; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -16,19 +15,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/0.1.0/operation/binding.json"; + return "/bindings/default implementation/0.1.0/operation/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/0.1.0/operation/binding - extended.json"; + return "/bindings/default implementation/0.1.0/operation/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/0.1.0/operation/binding - wrongly extended.json"; + return "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBindingTest.java new file mode 100644 index 00000000..d80ee8be --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBindingTest.java @@ -0,0 +1,39 @@ +package com.asyncapi.bindings.stomp.v0._1_0.server; + +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; +import com.asyncapi.v3.SerDeTest; +import org.jetbrains.annotations.NotNull; + +public abstract class STOMPServerBindingTest extends SerDeTest { + + @NotNull + @Override + protected Class objectClass() { + return STOMPServerBinding.class; + } + + @NotNull + @Override + protected String baseObjectJson() { + return "/bindings/default implementation/0.1.0/server/binding.json"; + } + + @NotNull + @Override + protected String extendedObjectJson() { + return "/bindings/default implementation/0.1.0/server/binding - extended.json"; + } + + @NotNull + @Override + protected String wronglyExtendedObjectJson() { + return "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; + } + + @NotNull + @Override + public STOMPServerBinding build() { + return new STOMPServerBinding(); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java index e12d2e1f..7211b83f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.stomp.withoutversion.channel; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -18,19 +18,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/without version/channel/binding.json"; + return "/bindings/default implementation/without version/channel/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/without version/channel/binding - extended.json"; + return "/bindings/default implementation/without version/channel/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/without version/channel/binding - wrongly extended.json"; + return "/bindings/default implementation/without version/channel/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java index 8d5ec799..8fd22677 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.stomp.withoutversion.message; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -16,19 +16,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/without version/message/binding.json"; + return "/bindings/default implementation/without version/message/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/without version/message/binding - extended.json"; + return "/bindings/default implementation/without version/message/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/without version/message/binding - wrongly extended.json"; + return "/bindings/default implementation/without version/message/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java index 21c6c05b..43c91a68 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.stomp.withoutversion.operation; -import com.asyncapi.bindings.stomp._1_0.STOMPBindingProvider; +import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; @@ -16,19 +16,19 @@ protected Class objectClass() { @NotNull @Override protected String baseObjectJson() { - return "/bindings/stomp/without version/operation/binding.json"; + return "/bindings/default implementation/without version/operation/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/stomp/without version/operation/binding - extended.json"; + return "/bindings/default implementation/without version/operation/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/stomp/without version/operation/binding - wrongly extended.json"; + return "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; } @NotNull diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java index bc6e0152..4ea42c32 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java @@ -1,40 +1,39 @@ package com.asyncapi.bindings.stomp.withoutversion.server; -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; import com.asyncapi.v3.SerDeTest; import org.jetbrains.annotations.NotNull; -public abstract class STOMPServerBindingTest extends SerDeTest { +public abstract class STOMPServerBindingTest extends SerDeTest { @NotNull @Override - protected Class objectClass() { - return WebSocketsServerBinding.class; + protected Class objectClass() { + return STOMPServerBinding.class; } @NotNull @Override protected String baseObjectJson() { - return "/bindings/websockets/without version/server/webSocketsServerBinding.json"; + return "/bindings/default implementation/without version/server/binding.json"; } @NotNull @Override protected String extendedObjectJson() { - return "/bindings/websockets/without version/server/webSocketsServerBinding - extended.json"; + return "/bindings/default implementation/without version/server/binding - extended.json"; } @NotNull @Override protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json"; + return "/bindings/default implementation/without version/server/binding - wrongly extended.json"; } @NotNull @Override - public ExtendableObject build() { - return new WebSocketsServerBinding(); + public STOMPServerBinding build() { + return new STOMPServerBinding(); } } diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - wrongly extended.json deleted file mode 100644 index a1ecfd51..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding.json deleted file mode 100644 index 04dbf945..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/channel/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - wrongly extended.json deleted file mode 100644 index a1ecfd51..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding.json deleted file mode 100644 index 04dbf945..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/message/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - wrongly extended.json deleted file mode 100644 index a1ecfd51..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding.json deleted file mode 100644 index 04dbf945..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/operation/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - wrongly extended.json deleted file mode 100644 index a1ecfd51..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "0.1.0", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding.json deleted file mode 100644 index 04dbf945..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/0.1.0/server/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "0.1.0" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - wrongly extended.json deleted file mode 100644 index 18560ee8..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "latest", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding.json deleted file mode 100644 index cdf165f6..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/channel/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "latest" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - wrongly extended.json deleted file mode 100644 index 18560ee8..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "latest", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding.json deleted file mode 100644 index cdf165f6..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/message/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "latest" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - wrongly extended.json deleted file mode 100644 index 18560ee8..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "latest", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding.json deleted file mode 100644 index cdf165f6..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/operation/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "latest" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - wrongly extended.json deleted file mode 100644 index 18560ee8..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "latest", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding.json deleted file mode 100644 index cdf165f6..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/latest/server/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "latest" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - wrongly extended.json deleted file mode 100644 index 62eff98f..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "0.199.36", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding.json deleted file mode 100644 index 1394045a..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/channel/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "0.199.36" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - wrongly extended.json deleted file mode 100644 index 62eff98f..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "0.199.36", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding.json deleted file mode 100644 index 1394045a..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/message/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "0.199.36" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - wrongly extended.json deleted file mode 100644 index 62eff98f..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "0.199.36", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding.json deleted file mode 100644 index 1394045a..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/operation/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "0.199.36" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - wrongly extended.json deleted file mode 100644 index 62eff98f..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding - wrongly extended.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bindingVersion": "0.199.36", - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding.json deleted file mode 100644 index 1394045a..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/unknown version/server/binding.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bindingVersion": "0.199.36" -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - wrongly extended.json deleted file mode 100644 index a16bbdf8..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding - wrongly extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding.json deleted file mode 100644 index 9e26dfee..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/channel/binding.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - wrongly extended.json deleted file mode 100644 index a16bbdf8..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding - wrongly extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding.json deleted file mode 100644 index 9e26dfee..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/message/binding.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - wrongly extended.json deleted file mode 100644 index a16bbdf8..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding - wrongly extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding.json deleted file mode 100644 index 9e26dfee..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/operation/binding.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - extended.json deleted file mode 100644 index 32459b79..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bindingVersion" : "0.1.0", - "x-number" : 0, - "x-string" : "", - "x-object" : { - "property" : { } - } -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - wrongly extended.json deleted file mode 100644 index a16bbdf8..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding - wrongly extended.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "x-number": 0, - "x-string": "", - "x-object": { - "property": {} - }, - "ext-number": 1 -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding.json deleted file mode 100644 index 9e26dfee..00000000 --- a/asyncapi-core/src/test/resources/bindings/stomp/without version/server/binding.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file From 64ebecb7c20791f1e0e3d86ee7c095f1b8383dc6 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Fri, 26 Apr 2024 03:21:40 +0400 Subject: [PATCH 040/141] tests(bindings): AMQP1 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/167 --- .../bindings/amqp1/AMQP1ChannelBinding.java | 31 +++ .../bindings/amqp1/AMQP1MessageBinding.java | 31 +++ .../bindings/amqp1/AMQP1OperationBinding.java | 31 +++ .../bindings/amqp1/AMQP1ServerBinding.java | 31 +++ .../v0/_1_0/channel/AMQP1ChannelBinding.java | 15 +- .../v0/_1_0/message/AMQP1MessageBinding.java | 15 +- .../_1_0/operation/AMQP1OperationBinding.java | 15 +- .../v0/_1_0/server/AMQP1ServerBinding.java | 15 +- .../com/asyncapi/bindings/BindingTest.java | 95 +++++++++ .../com/asyncapi/bindings/BindingsTest.java | 5 + .../asyncapi/bindings/amqp1/AMQP1Test.java | 197 ++++++++++++++++++ .../v2/2.0.0/model/asyncapi - extended.json | 56 +++-- .../model/channel/channelItem - extended.json | 24 ++- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 12 +- ... with reference to message - extended.json | 8 +- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 28 ++- .../2.0.0/model/server/server - extended.json | 4 +- .../v2/2.6.0/model/asyncapi - extended.json | 12 +- .../components/components - extended.json | 8 +- .../2.6.0/model/server/server - extended.json | 4 +- .../v3/3.0.0/model/asyncapi - extended.json | 16 +- .../components/components - extended.json | 8 +- .../3.0.0/model/server/server - extended.json | 4 +- .../server with reference - extended.json | 4 +- 27 files changed, 623 insertions(+), 58 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1MessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1OperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1Test.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ChannelBinding.java new file mode 100644 index 00000000..8fc85d22 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ChannelBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.amqp1; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes AMQP 1.0 channel binding. + * + * @version 0.1.0 + * @see AMQP 1.0 channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class AMQP1ChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1MessageBinding.java new file mode 100644 index 00000000..d3d64add --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1MessageBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.amqp1; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes AMQP 1.0 message binding. + * + * @version 0.1.0 + * @see AMQP message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class AMQP1MessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1OperationBinding.java new file mode 100644 index 00000000..8f059a9d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1OperationBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.amqp1; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes AMQP 1.0 operation binding. + * + * @version 0.1.0 + * @see AMQP operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class AMQP1OperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ServerBinding.java new file mode 100644 index 00000000..13afc8c2 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ServerBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.amqp1; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes AMQP 1.0 server binding. + * + * @version 0.1.0 + * @see AMQP server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class AMQP1ServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java index 61343b3f..8f3f0c83 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.amqp1.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class AMQP1ChannelBinding extends ChannelBinding { +public class AMQP1ChannelBinding extends com.asyncapi.bindings.amqp1.AMQP1ChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java index 4bd1abb2..81804da6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.amqp1.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class AMQP1MessageBinding extends MessageBinding { +public class AMQP1MessageBinding extends com.asyncapi.bindings.amqp1.AMQP1MessageBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java index 06754e31..768aa45b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.amqp1.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class AMQP1OperationBinding extends OperationBinding { +public class AMQP1OperationBinding extends com.asyncapi.bindings.amqp1.AMQP1OperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java index 81852516..d1c816d1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.amqp1.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class AMQP1ServerBinding extends ServerBinding { +public class AMQP1ServerBinding extends com.asyncapi.bindings.amqp1.AMQP1ServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java new file mode 100644 index 00000000..47d4b273 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java @@ -0,0 +1,95 @@ +package com.asyncapi.bindings; + +import com.asyncapi.ExtendableObject; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; + +public abstract class BindingTest { + + private static final ObjectMapper objectMapper = new ObjectMapper() + .setSerializationInclusion(JsonInclude.Include.NON_NULL); + + protected Class bindingTypeClass; + protected String pathToBindingJson; + protected String pathToExtendedBindingJson; + protected String pathToWronglyExtendedBindingJson; + protected BindingType binding; + + @Test + @Order(1) + @DisplayName("compare binding from Json and from code") + public void compareBindingFromJsonAndFromCode() throws IOException, URISyntaxException { + Assertions.assertEquals(read(pathToBindingJson, bindingTypeClass), binding); + } + + @Test + @Order(2) + @DisplayName("compare extended binding from Json and from code") + public void compareExtendedBindingFromJsonAndFromCode() throws IOException, URISyntaxException { + var binding = read(pathToExtendedBindingJson, bindingTypeClass); + Assertions.assertEquals( + Map.ofEntries( + Map.entry("x-number", 0), + Map.entry("x-string", ""), + Map.entry("x-object", Map.ofEntries(Map.entry("property", Collections.emptyMap()))) + ), + binding.getExtensionFields() + ); + + Assertions.assertEquals(read(pathToExtendedBindingJson, bindingTypeClass), binding); + } + + @Test + @Order(3) + @DisplayName("deserialize and compare extended binding json with extended binding from code") + public void deserializeAndCompareExtendedBindingJsonWithExtendedBindingFromCode() throws IOException, URISyntaxException { + var extensions = new LinkedHashMap(); + extensions.put("x-number", 0); + extensions.put("x-string", ""); + extensions.put("x-object", Map.ofEntries(Map.entry("property", Collections.emptyMap()))); + + binding.setExtensionFields(extensions); + Assertions.assertEquals( + read(pathToExtendedBindingJson), + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(binding) + ); + } + + @Test + @Order(4) + @DisplayName("throw exception when binding extended wrongly") + public void throwExceptionWhenBindingExtendedWrongly() { + var exception = Assertions.assertThrows(JsonMappingException.class, () -> { + read(pathToWronglyExtendedBindingJson, bindingTypeClass); + }); + + Assertions.assertTrue(exception.getMessage().startsWith("\"ext-number\" is not valid extension property (through reference chain:")); + } + + private String read(@NotNull String pathToJson) throws IOException, URISyntaxException { + Path path = Path.of(BindingTest.class.getResource(pathToJson).toURI()); + + return Files.readString(path); + } + + private BindingType read(@NotNull String pathToJson, @NotNull Class bindingTypeClass) throws IOException, URISyntaxException { + Path path = Path.of(BindingTest.class.getResource(pathToJson).toURI()); + + return objectMapper.readValue(Files.readString(path), bindingTypeClass); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java index 3ea2c57f..be3ba6d5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java @@ -1,5 +1,6 @@ package com.asyncapi.bindings; +import com.asyncapi.bindings.amqp1.AMQP1Test; import com.asyncapi.bindings.redis.RedisTest; import com.asyncapi.bindings.stomp.STOMPTest; import com.asyncapi.bindings.websockets.WebSocketsTest; @@ -9,6 +10,10 @@ @DisplayName("Bindings") public class BindingsTest { + @Nested + @DisplayName("AMQP1") + class AMQP1 extends AMQP1Test {} + @Nested @DisplayName("Redis") class Redis extends RedisTest {} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1Test.java new file mode 100644 index 00000000..a135eb8f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1Test.java @@ -0,0 +1,197 @@ +package com.asyncapi.bindings.amqp1; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +public abstract class AMQP1Test { + + @Nested + @DisplayName("unknown version") + class UnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new AMQP1ChannelBinding(); + super.bindingTypeClass = AMQP1ChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new AMQP1MessageBinding(); + super.bindingTypeClass = AMQP1MessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new AMQP1OperationBinding(); + super.bindingTypeClass = AMQP1OperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new AMQP1ServerBinding(); + super.bindingTypeClass = AMQP1ServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + + } + + @Nested + @DisplayName("without version") + class WithoutVersion { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new AMQP1ChannelBinding(); + super.bindingTypeClass = AMQP1ChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new AMQP1MessageBinding(); + super.bindingTypeClass = AMQP1MessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new AMQP1OperationBinding(); + super.bindingTypeClass = AMQP1OperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new AMQP1ServerBinding(); + super.bindingTypeClass = AMQP1ServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + + } + + @Nested + @DisplayName("latest") + class Latest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new AMQP1ChannelBinding(); + super.bindingTypeClass = AMQP1ChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new AMQP1MessageBinding(); + super.bindingTypeClass = AMQP1MessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new AMQP1OperationBinding(); + super.bindingTypeClass = AMQP1OperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new AMQP1ServerBinding(); + super.bindingTypeClass = AMQP1ServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + + } + + @Nested + @DisplayName("0.1.0") + class V0_1_0 { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new AMQP1ChannelBinding(); + super.bindingTypeClass = AMQP1ChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new AMQP1MessageBinding(); + super.bindingTypeClass = AMQP1MessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new AMQP1OperationBinding(); + super.bindingTypeClass = AMQP1OperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new AMQP1ServerBinding(); + super.bindingTypeClass = AMQP1ServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + + } + +} diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 6b3e3aae..d91617c3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -37,7 +37,9 @@ "mqttBroker" : [ ] } ], "bindings" : { - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -128,7 +130,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -241,7 +245,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -357,7 +363,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -470,7 +478,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -604,7 +614,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { @@ -721,7 +733,9 @@ "vhost" : "/" } }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", @@ -904,7 +918,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { @@ -1137,7 +1153,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -1262,7 +1280,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { @@ -1349,7 +1369,9 @@ } }, "serverBindings" : { - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -1424,7 +1446,9 @@ "vhost" : "/" } }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", @@ -1536,7 +1560,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -1623,7 +1649,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 552eb27c..d14f6a5d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -30,7 +30,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -143,7 +145,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -259,7 +263,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -372,7 +378,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -506,7 +514,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { @@ -623,7 +633,9 @@ "vhost" : "/" } }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index d2efbcc0..e9b39d6c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -50,7 +50,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index f11a4fe1..718fd527 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -39,7 +39,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index d35aa263..23a1fac3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -28,7 +28,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -141,7 +143,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -275,7 +279,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index dc4a7c33..a1b1e1fb 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -28,7 +28,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -141,7 +143,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 1d67359c..4e139c5e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -28,7 +28,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 9989eedd..5e761323 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -81,7 +81,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { @@ -314,7 +316,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -439,7 +443,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { @@ -526,7 +532,9 @@ } }, "serverBindings" : { - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -601,7 +609,9 @@ "vhost" : "/" } }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "destination" : "user-signup-exchg", @@ -713,7 +723,9 @@ "timestamp" : true, "ack" : false }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { @@ -800,7 +812,9 @@ "contentEncoding" : "gzip", "messageType" : "user.signup" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { "bindingVersion" : "0.0.1", "headers" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index f44f011d..ff0ac635 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -17,7 +17,9 @@ "mqttBroker" : [ ] } ], "bindings" : { - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index b1674d21..a27233e2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -46,7 +46,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -1190,7 +1192,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -2866,7 +2870,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 065c5ff7..a6809401 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -58,7 +58,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -1734,7 +1736,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 65e7b11e..7a5b4bea 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -27,7 +27,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 4007e1d8..59d63286 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -73,7 +73,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -176,7 +178,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -5043,7 +5047,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -12462,7 +12468,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index 86547eec..f954fa97 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -75,7 +75,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, @@ -7494,7 +7496,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 032156a5..98564ea2 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -41,7 +41,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 6b6bdbd6..f45509c0 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -44,7 +44,9 @@ "amqp" : { "$ref" : "#/components/serverBindings/amqp" }, - "amqp1" : { }, + "amqp1" : { + "bindingVersion" : "0.1.0" + }, "anypointmq" : { }, "googlepubsub" : { }, "http" : { }, From 718a49e1bf8f44ea9dd8181b57ed668ccfc2e8cf Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Fri, 26 Apr 2024 20:18:57 +0400 Subject: [PATCH 041/141] tests(bindings): AMQP 0.1.0, 0.2.0, 0.3.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/166 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/amqp/AMQPChannelBinding.java | 35 ++++ .../bindings/amqp/AMQPMessageBinding.java | 35 ++++ .../bindings/amqp/AMQPOperationBinding.java | 35 ++++ .../bindings/amqp/AMQPServerBinding.java | 35 ++++ .../v0/_1_0/channel/AMQPChannelBinding.java | 65 ++++++++ .../amqp/v0/_1_0/channel/AMQPChannelType.java | 24 +++ .../AMQPChannelExchangeProperties.java | 62 ++++++++ .../exchange/AMQPChannelExchangeType.java | 33 ++++ .../queue/AMQPChannelQueueProperties.java | 62 ++++++++ .../v0/_1_0/message/AMQPMessageBinding.java | 52 ++++++ .../_1_0/operation/AMQPOperationBinding.java | 150 ++++++++++++++++++ .../v0/_1_0/server/AMQPServerBinding.java | 32 ++++ .../v0/_2_0/channel/AMQPChannelBinding.java | 17 +- .../v0/_2_0/message/AMQPMessageBinding.java | 20 +-- .../_2_0/operation/AMQPOperationBinding.java | 20 +-- .../v0/_2_0/server/AMQPServerBinding.java | 15 +- .../v0/_3_0/channel/AMQPChannelBinding.java | 65 ++++++++ .../amqp/v0/_3_0/channel/AMQPChannelType.java | 24 +++ .../AMQPChannelExchangeProperties.java | 71 +++++++++ .../exchange/AMQPChannelExchangeType.java | 33 ++++ .../queue/AMQPChannelQueueProperties.java | 71 +++++++++ .../v0/_3_0/message/AMQPMessageBinding.java | 52 ++++++ .../_3_0/operation/AMQPOperationBinding.java | 140 ++++++++++++++++ .../v0/_3_0/server/AMQPServerBinding.java | 32 ++++ .../com/asyncapi/bindings/amqp/AMQP.java | 10 ++ .../bindings/amqp/AMQPLatestTest.java | 54 +++++++ .../bindings/amqp/AMQPUnknownVersionTest.java | 54 +++++++ .../bindings/amqp/AMQPV0_1_0Test.java | 106 +++++++++++++ .../bindings/amqp/AMQPV0_2_0Test.java | 106 +++++++++++++ .../bindings/amqp/AMQPV0_3_0Test.java | 105 ++++++++++++ .../bindings/amqp/AMQPWithoutVersionTest.java | 54 +++++++ .../v0/_2_0/channel/AMQPChannelBindingTest.kt | 42 ----- .../v0/_2_0/message/AMQPMessageBindingTest.kt | 22 --- .../operation/AMQPOperationBindingTest.kt | 30 ---- .../asyncapi/examples/v2/_0_0/RpcClient.kt | 8 +- .../asyncapi/examples/v2/_0_0/RpcServer.kt | 8 +- .../asyncapi/examples/v2/_6_0/RpcClient.kt | 8 +- .../asyncapi/examples/v2/_6_0/RpcServer.kt | 8 +- .../examples/v3/_0_0/RpcClientAsyncAPI.kt | 8 +- .../examples/v3/_0_0/RpcServerAsyncAPI.kt | 8 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v3/_0_0/model/channel/ChannelTest.kt | 6 +- .../_0_0/model/channel/message/MessageTest.kt | 8 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../v3/_0_0/model/operation/OperationTest.kt | 6 +- .../model/operation/OperationTraitTest.kt | 6 +- .../0.1.0/channel/binding - extended.json | 21 +++ .../channel/binding - wrongly extended.json | 22 +++ .../bindings/amqp/0.1.0/channel/binding.json | 16 ++ .../0.1.0/message/binding - extended.json | 10 ++ .../message/binding - wrongly extended.json | 11 ++ .../bindings/amqp/0.1.0/message/binding.json | 5 + .../0.1.0/operation/binding - extended.json | 18 +++ .../operation/binding - wrongly extended.json | 23 +++ .../amqp/0.1.0/operation/binding.json | 17 ++ .../amqp/0.1.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 ++ .../bindings/amqp/0.1.0/server/binding.json | 3 + .../channel/binding - extended.json} | 0 .../channel/binding - wrongly extended.json} | 0 .../channel/binding.json} | 0 .../message/binding - extended.json} | 0 .../message/binding - wrongly extended.json} | 0 .../message/binding.json} | 0 .../operation/binding - extended.json} | 0 .../binding - wrongly extended.json} | 0 .../operation/binding.json} | 0 .../amqp/0.2.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 ++ .../bindings/amqp/0.2.0/server/binding.json | 3 + .../0.3.0/channel/binding - extended.json | 23 +++ .../channel/binding - wrongly extended.json | 24 +++ .../bindings/amqp/0.3.0/channel/binding.json | 18 +++ .../0.3.0/message/binding - extended.json | 10 ++ .../message/binding - wrongly extended.json | 11 ++ .../bindings/amqp/0.3.0/message/binding.json | 5 + .../0.3.0/operation/binding - extended.json | 17 ++ .../operation/binding - wrongly extended.json | 22 +++ .../amqp/0.3.0/operation/binding.json | 16 ++ .../amqp/0.3.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 ++ .../bindings/amqp/0.3.0/server/binding.json | 3 + .../latest/channel/binding - extended.json | 23 +++ .../channel/binding - wrongly extended.json | 24 +++ .../bindings/amqp/latest/channel/binding.json | 18 +++ .../latest/message/binding - extended.json | 10 ++ .../message/binding - wrongly extended.json | 11 ++ .../bindings/amqp/latest/message/binding.json | 5 + .../latest/operation/binding - extended.json | 17 ++ .../operation/binding - wrongly extended.json | 22 +++ .../amqp/latest/operation/binding.json | 16 ++ .../latest/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 ++ .../bindings/amqp/latest/server/binding.json | 3 + .../channel/binding - extended.json | 23 +++ .../channel/binding - wrongly extended.json | 24 +++ .../amqp/unknown version/channel/binding.json | 18 +++ .../message/binding - extended.json | 10 ++ .../message/binding - wrongly extended.json | 11 ++ .../amqp/unknown version/message/binding.json | 5 + .../operation/binding - extended.json | 17 ++ .../operation/binding - wrongly extended.json | 22 +++ .../unknown version/operation/binding.json | 16 ++ .../server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 ++ .../amqp/unknown version/server/binding.json | 3 + .../channel/binding - extended.json | 23 +++ .../channel/binding - wrongly extended.json | 23 +++ .../amqp/without version/channel/binding.json | 17 ++ .../message/binding - extended.json | 10 ++ .../message/binding - wrongly extended.json | 10 ++ .../amqp/without version/message/binding.json | 4 + .../operation/binding - extended.json | 17 ++ .../operation/binding - wrongly extended.json | 22 +++ .../without version/operation/binding.json | 15 ++ .../server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 8 + .../amqp/without version/server/binding.json | 1 + pom.xml | 7 + 132 files changed, 2551 insertions(+), 188 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelType.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeType.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/server/AMQPServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelType.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeType.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/server/AMQPServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQP.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_2_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_3_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding.json rename asyncapi-core/src/test/resources/bindings/amqp/{channel/amqpChannelBinding - extended.json => 0.2.0/channel/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/amqp/{channel/amqpChannelBinding - wrongly extended.json => 0.2.0/channel/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/amqp/{channel/amqpChannelBinding.json => 0.2.0/channel/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/amqp/{message/amqpMessageBinding - extended.json => 0.2.0/message/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/amqp/{message/amqpMessageBinding - wrongly extended.json => 0.2.0/message/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/amqp/{message/amqpMessageBinding.json => 0.2.0/message/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/amqp/{operation/amqpOperationBinding - extended.json => 0.2.0/operation/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/amqp/{operation/amqpOperationBinding - wrongly extended.json => 0.2.0/operation/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/amqp/{operation/amqpOperationBinding.json => 0.2.0/operation/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index ec7a235b..4f9f317f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding; +import com.asyncapi.bindings.amqp.AMQPChannelBinding; import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index f817f2fb..4c5e9b4d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding; +import com.asyncapi.bindings.amqp.AMQPMessageBinding; import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 4a0b19ab..931fcb31 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding; +import com.asyncapi.bindings.amqp.AMQPOperationBinding; import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 142818a4..ef39d492 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.bindings.amqp.v0._2_0.server.AMQPServerBinding; +import com.asyncapi.bindings.amqp.AMQPServerBinding; import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPChannelBinding.java new file mode 100644 index 00000000..eedcef70 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPChannelBinding.java @@ -0,0 +1,35 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * Describes AMQP 0-9-1 channel binding. + *

+ * Contains information about the channel representation in AMQP. + * + * @since 1.0.0-RC2 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._1_0.channel.AMQPChannelBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding.class, name = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class AMQPChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPMessageBinding.java new file mode 100644 index 00000000..6dfa065f --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPMessageBinding.java @@ -0,0 +1,35 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * Describes AMQP 0-9-1 message binding. + *

+ * Contains information about the message representation in AMQP. + * + * @since 1.0.0-RC2 + * @see AMQP message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.amqp.v0._3_0.message.AMQPMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._1_0.message.AMQPMessageBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding.class, name = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._3_0.message.AMQPMessageBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class AMQPMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPOperationBinding.java new file mode 100644 index 00000000..a6b18f00 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPOperationBinding.java @@ -0,0 +1,35 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * Describes AMQP 0-9-1 operation binding. + *

+ * Contains information about the operation representation in AMQP. + * + * @since 1.0.0-RC2 + * @see AMQP operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._1_0.operation.AMQPOperationBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding.class, name = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class AMQPOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPServerBinding.java new file mode 100644 index 00000000..ffca0b47 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPServerBinding.java @@ -0,0 +1,35 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * Describes AMQP 0-9-1 server binding. + *

+ * Contains information about the server representation in AMQP. + * + * @since 1.0.0-RC2 + * @see AMQP server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.amqp.v0._3_0.server.AMQPServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._1_0.server.AMQPServerBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._2_0.server.AMQPServerBinding.class, name = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.amqp.v0._3_0.server.AMQPServerBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class AMQPServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java new file mode 100644 index 00000000..2e785b2e --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java @@ -0,0 +1,65 @@ +package com.asyncapi.bindings.amqp.v0._1_0.channel; + +import com.asyncapi.bindings.amqp.v0._1_0.channel.exchange.AMQPChannelExchangeProperties; +import com.asyncapi.bindings.amqp.v0._1_0.channel.queue.AMQPChannelQueueProperties; +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Describes AMQP 0-9-1 channel binding. + *

+ * Contains information about the channel representation in AMQP. + * + * @version 0.1.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes AMQP 0-9-1 channel binding.") +public class AMQPChannelBinding extends com.asyncapi.bindings.amqp.AMQPChannelBinding { + + /** + * Defines what type of channel is it. Can be either queue or routingKey (default). + */ + @NotNull + @Builder.Default + @javax.validation.constraints.NotNull + @JsonProperty(value = "is", required = true, defaultValue = "routingKey") + @JsonPropertyDescription("Defines what type of channel is it. Can be either queue or routingKey (default).") + private AMQPChannelType is = AMQPChannelType.ROUTING_KEY; + + /** + * When is=routingKey, this object defines the exchange properties. + */ + @Nullable + @JsonProperty("exchange") + @JsonPropertyDescription("When is=routingKey, this object defines the exchange properties.") + private AMQPChannelExchangeProperties exchange; + + /** + * When is=queue, this object defines the queue properties. + */ + @Nullable + @JsonProperty("queue") + @JsonPropertyDescription("When is=queue, this object defines the queue properties.") + private AMQPChannelQueueProperties queue; + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelType.java new file mode 100644 index 00000000..3bca793b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelType.java @@ -0,0 +1,24 @@ +package com.asyncapi.bindings.amqp.v0._1_0.channel; + +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Describes AMQP 0-9-1 channel type. + *

+ * Contains information about the type of channel in AMQP. + * + * @version 0.1.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +public enum AMQPChannelType { + + @JsonProperty("queue") + QUEUE, + + @JsonProperty("routingKey") + @JsonAlias("routingKey") + ROUTING_KEY + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java new file mode 100644 index 00000000..16aa431e --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java @@ -0,0 +1,62 @@ +package com.asyncapi.bindings.amqp.v0._1_0.channel.exchange; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes AMQP 0-9-1 channel exchange properties. + *

+ * Contains information about the channel exchange properties in AMQP. + * + * @version 0.1.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +@JsonClassDescription("Describes AMQP 0-9-1 channel exchange properties.") +public class AMQPChannelExchangeProperties { + + /** + * The name of the exchange. It MUST NOT exceed 255 characters long. + */ + @Nullable + @javax.validation.constraints.Size( + max = 255, + message = "Exchange name must not exceed 255 characters long." + ) + @JsonProperty("name") + @JsonPropertyDescription("The name of the exchange. It MUST NOT exceed 255 characters long.") + private String name; + + /** + * The type of the exchange. Can be either topic, direct, fanout, default or headers. + */ + @Nullable + @JsonProperty("type") + @JsonPropertyDescription("The type of the exchange. Can be either topic, direct, fanout, default or headers.") + private AMQPChannelExchangeType type; + + /** + * Whether the exchange should survive broker restarts or not. + */ + @Nullable + @JsonProperty("durable") + @JsonPropertyDescription("Whether the exchange should survive broker restarts or not.") + private Boolean durable; + + /** + * Whether the exchange should be deleted when the last queue is unbound from it. + */ + @Nullable + @JsonProperty("autoDelete") + @JsonPropertyDescription("Whether the exchange should be deleted when the last queue is unbound from it.") + private Boolean autoDelete; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeType.java new file mode 100644 index 00000000..8531ba38 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeType.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.amqp.v0._1_0.channel.exchange; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Describes AMQP 0-9-1 channel exchange type. + *

+ * Contains information about the channel exchange type in AMQP. + * + * @version 0.1.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +@JsonClassDescription("Describes AMQP 0-9-1 channel exchange type.") +public enum AMQPChannelExchangeType { + + @JsonProperty("topic") + TOPIC, + + @JsonProperty("direct") + DIRECT, + + @JsonProperty("fanout") + FANOUT, + + @JsonProperty("default") + DEFAULT, + + @JsonProperty("headers") + HEADERS + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java new file mode 100644 index 00000000..fc2d602b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java @@ -0,0 +1,62 @@ +package com.asyncapi.bindings.amqp.v0._1_0.channel.queue; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes AMQP 0-9-1 channel queue properties. + *

+ * Contains information about the queue exchange properties in AMQP. + * + * @version 0.1.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +@JsonClassDescription("Describes AMQP 0-9-1 channel queue properties.") +public class AMQPChannelQueueProperties { + + /** + * The name of the queue. It MUST NOT exceed 255 characters long. + */ + @Nullable + @javax.validation.constraints.Size( + max = 255, + message = "Queue name must not exceed 255 characters long." + ) + @JsonProperty("name") + @JsonPropertyDescription("The name of the queue. It MUST NOT exceed 255 characters long.") + private String name; + + /** + * Whether the queue should survive broker restarts or not. + */ + @Nullable + @JsonProperty("durable") + @JsonPropertyDescription("Whether the queue should survive broker restarts or not.") + private Boolean durable; + + /** + * Whether the queue should be used only by one connection or not. + */ + @Nullable + @JsonProperty("exclusive") + @JsonPropertyDescription("Whether the queue should be used only by one connection or not.") + private Boolean exclusive; + + /** + * Whether the queue should be deleted when the last consumer unsubscribes. + */ + @Nullable + @JsonProperty("autoDelete") + @JsonPropertyDescription("Whether the queue should be deleted when the last consumer unsubscribes.") + private Boolean autoDelete; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java new file mode 100644 index 00000000..64f69ad0 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java @@ -0,0 +1,52 @@ +package com.asyncapi.bindings.amqp.v0._1_0.message; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes AMQP 0-9-1 message binding. + *

+ * Contains information about the message representation in AMQP. + * + * @version 0.1.0 + * @see AMQP message binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes AMQP 0-9-1 message binding.") +public class AMQPMessageBinding extends com.asyncapi.bindings.amqp.AMQPMessageBinding { + + /** + * A MIME encoding for the message content. + */ + @Nullable + @JsonProperty("contentEncoding") + @JsonPropertyDescription("A MIME encoding for the message content.") + private String contentEncoding; + + /** + * Application-specific message type. + */ + @Nullable + @JsonProperty("messageType") + @JsonPropertyDescription("Application-specific message type.") + private String messageType; + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java new file mode 100644 index 00000000..46c6ea54 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java @@ -0,0 +1,150 @@ +package com.asyncapi.bindings.amqp.v0._1_0.operation; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * Describes AMQP 0-9-1 operation binding. + *

+ * Contains information about the operation representation in AMQP. + * + * @version 0.1.0 + * @see AMQP operation binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes AMQP 0-9-1 operation binding.") +public class AMQPOperationBinding extends com.asyncapi.bindings.amqp.AMQPOperationBinding { + + /** + * TTL (Time-To-Live) for the message. It MUST be greater than or equal to zero. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @javax.validation.constraints.Min( + value = 0, + message = "TTL (Time-To-Live) for the message must be greater than or equal to zero" + ) + @JsonProperty("expiration") + @JsonPropertyDescription("TTL (Time-To-Live) for the message. It MUST be greater than or equal to zero.") + private Integer expiration; + + /** + * Identifies the user who has sent the message. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("userId") + @JsonPropertyDescription("Identifies the user who has sent the message.") + private String userId; + + /** + * The routing keys the message should be routed to at the time of publishing. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("cc") + @JsonPropertyDescription("The routing keys the message should be routed to at the time of publishing.") + private List cc; + + /** + * A priority for the message. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("priority") + @JsonPropertyDescription("A priority for the message.") + private Integer priority; + + /** + * Delivery mode of the message. Its value MUST be either 1 (transient) or 2 (persistent). + *

+ * Applies to: publish, subscribe + */ + @Nullable + @javax.validation.constraints.Min( + value = 1, + message = "Delivery mode of the message must be either 1 (transient) or 2 (persistent)" + ) + @javax.validation.constraints.Max( + value = 2, + message = "Delivery mode of the message must be either 1 (transient) or 2 (persistent)" + ) + @JsonProperty("deliveryMode") + @JsonPropertyDescription("Delivery mode of the message. Its value MUST be either 1 (transient) or 2 (persistent).") + private Integer deliveryMode; + + /** + * Whether the message is mandatory or not. + *

+ * Applies to: publish + */ + @Nullable + @JsonProperty("mandatory") + @JsonPropertyDescription("Whether the message is mandatory or not.") + private Boolean mandatory; + + /** + * Like {@link #cc} but consumers will not receive this information. + *

+ * Applies to: publish + */ + @Nullable + @JsonProperty("bcc") + @JsonPropertyDescription("Like cc but consumers will not receive this information.") + private List bcc; + + /** + * Name of the queue where the consumer should send the response. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("replyTo") + @JsonPropertyDescription("Name of the queue where the consumer should send the response.") + private String replyTo; + + /** + * Whether the message should include a timestamp or not. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("timestamp") + @JsonPropertyDescription("Whether the message should include a timestamp or not.") + private Boolean timestamp; + + /** + * Whether the consumer should ack the message or not. + *

+ * Applies to: subscribe + */ + @Nullable + @JsonProperty("ack") + @JsonPropertyDescription("Whether the consumer should ack the message or not.") + private Boolean ack; + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/server/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/server/AMQPServerBinding.java new file mode 100644 index 00000000..735e4271 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/server/AMQPServerBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.amqp.v0._1_0.server; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes AMQP 0-9-1 server binding. + * + * @version 0.1.0 + * @see AMQP server binding + * @author Pavel Bodiachevskii + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class AMQPServerBinding extends com.asyncapi.bindings.amqp.AMQPServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java index f25da590..5f5c552e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.amqp.v0._2_0.channel; -import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeProperties; import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties; import com.fasterxml.jackson.annotation.JsonClassDescription; @@ -25,7 +24,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes AMQP 0-9-1 channel binding.") -public class AMQPChannelBinding extends ChannelBinding { +public class AMQPChannelBinding extends com.asyncapi.bindings.amqp.AMQPChannelBinding { /** * Defines what type of channel is it. Can be either queue or routingKey (default). @@ -53,10 +52,14 @@ public class AMQPChannelBinding extends ChannelBinding { @JsonPropertyDescription("When is=queue, this object defines the queue properties.") private AMQPChannelQueueProperties queue; - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private final String bindingVersion = "0.2.0"; + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java index 0fcb70e8..fcc8e2c0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.amqp.v0._2_0.message; -import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -22,7 +21,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes AMQP 0-9-1 message binding.") -public class AMQPMessageBinding extends MessageBinding { +public class AMQPMessageBinding extends com.asyncapi.bindings.amqp.AMQPMessageBinding { /** * A MIME encoding for the message content. @@ -40,13 +39,14 @@ public class AMQPMessageBinding extends MessageBinding { @JsonPropertyDescription("Application-specific message type.") private String messageType; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.2.0"; + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java index 54121114..a2e479fd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.amqp.v0._2_0.operation; -import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -24,7 +23,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes AMQP 0-9-1 operation binding.") -public class AMQPOperationBinding extends OperationBinding { +public class AMQPOperationBinding extends com.asyncapi.bindings.amqp.AMQPOperationBinding { /** * TTL (Time-To-Live) for the message. It MUST be greater than or equal to zero. @@ -138,13 +137,14 @@ public class AMQPOperationBinding extends OperationBinding { @JsonPropertyDescription("Whether the consumer should ack the message or not.") private Boolean ack; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.2.0"; + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java index a14af6ed..868088a0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.amqp.v0._2_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class AMQPServerBinding extends ServerBinding { +public class AMQPServerBinding extends com.asyncapi.bindings.amqp.AMQPServerBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java new file mode 100644 index 00000000..d1925075 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java @@ -0,0 +1,65 @@ +package com.asyncapi.bindings.amqp.v0._3_0.channel; + +import com.asyncapi.bindings.amqp.v0._3_0.channel.exchange.AMQPChannelExchangeProperties; +import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties; +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Describes AMQP 0-9-1 channel binding. + *

+ * Contains information about the channel representation in AMQP. + * + * @version 0.3.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes AMQP 0-9-1 channel binding.") +public class AMQPChannelBinding extends com.asyncapi.bindings.amqp.AMQPChannelBinding { + + /** + * Defines what type of channel is it. Can be either queue or routingKey (default). + */ + @NotNull + @Builder.Default + @javax.validation.constraints.NotNull + @JsonProperty(value = "is", required = true, defaultValue = "routingKey") + @JsonPropertyDescription("Defines what type of channel is it. Can be either queue or routingKey (default).") + private AMQPChannelType is = AMQPChannelType.ROUTING_KEY; + + /** + * When is=routingKey, this object defines the exchange properties. + */ + @Nullable + @JsonProperty("exchange") + @JsonPropertyDescription("When is=routingKey, this object defines the exchange properties.") + private AMQPChannelExchangeProperties exchange; + + /** + * When is=queue, this object defines the queue properties. + */ + @Nullable + @JsonProperty("queue") + @JsonPropertyDescription("When is=queue, this object defines the queue properties.") + private AMQPChannelQueueProperties queue; + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelType.java new file mode 100644 index 00000000..a270537d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelType.java @@ -0,0 +1,24 @@ +package com.asyncapi.bindings.amqp.v0._3_0.channel; + +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Describes AMQP 0-9-1 channel type. + *

+ * Contains information about the type of channel in AMQP. + * + * @version 0.3.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +public enum AMQPChannelType { + + @JsonProperty("queue") + QUEUE, + + @JsonProperty("routingKey") + @JsonAlias("routingKey") + ROUTING_KEY + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java new file mode 100644 index 00000000..aa0476ba --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java @@ -0,0 +1,71 @@ +package com.asyncapi.bindings.amqp.v0._3_0.channel.exchange; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes AMQP 0-9-1 channel exchange properties. + *

+ * Contains information about the channel exchange properties in AMQP. + * + * @version 0.3.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +@JsonClassDescription("Describes AMQP 0-9-1 channel exchange properties.") +public class AMQPChannelExchangeProperties { + + /** + * The name of the exchange. It MUST NOT exceed 255 characters long. + */ + @Nullable + @javax.validation.constraints.Size( + max = 255, + message = "Exchange name must not exceed 255 characters long." + ) + @JsonProperty("name") + @JsonPropertyDescription("The name of the exchange. It MUST NOT exceed 255 characters long.") + private String name; + + /** + * The type of the exchange. Can be either topic, direct, fanout, default or headers. + */ + @Nullable + @JsonProperty("type") + @JsonPropertyDescription("The type of the exchange. Can be either topic, direct, fanout, default or headers.") + private AMQPChannelExchangeType type; + + /** + * Whether the exchange should survive broker restarts or not. + */ + @Nullable + @JsonProperty("durable") + @JsonPropertyDescription("Whether the exchange should survive broker restarts or not.") + private Boolean durable; + + /** + * Whether the exchange should be deleted when the last queue is unbound from it. + */ + @Nullable + @JsonProperty("autoDelete") + @JsonPropertyDescription("Whether the exchange should be deleted when the last queue is unbound from it.") + private Boolean autoDelete; + + /** + * The virtual host of the exchange. Defaults to /. + */ + @Nullable + @Builder.Default + @JsonProperty(value = "vhost", defaultValue = "/") + @JsonPropertyDescription("The virtual host of the exchange. Defaults to /.") + private String vhost = "/"; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeType.java new file mode 100644 index 00000000..7abf4fc8 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeType.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.amqp.v0._3_0.channel.exchange; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Describes AMQP 0-9-1 channel exchange type. + *

+ * Contains information about the channel exchange type in AMQP. + * + * @version 0.3.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +@JsonClassDescription("Describes AMQP 0-9-1 channel exchange type.") +public enum AMQPChannelExchangeType { + + @JsonProperty("topic") + TOPIC, + + @JsonProperty("direct") + DIRECT, + + @JsonProperty("fanout") + FANOUT, + + @JsonProperty("default") + DEFAULT, + + @JsonProperty("headers") + HEADERS + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java new file mode 100644 index 00000000..e67c88a7 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java @@ -0,0 +1,71 @@ +package com.asyncapi.bindings.amqp.v0._3_0.channel.queue; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes AMQP 0-9-1 channel queue properties. + *

+ * Contains information about the queue exchange properties in AMQP. + * + * @version 0.3.0 + * @see AMQP channel binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +@JsonClassDescription("Describes AMQP 0-9-1 channel queue properties.") +public class AMQPChannelQueueProperties { + + /** + * The name of the queue. It MUST NOT exceed 255 characters long. + */ + @Nullable + @javax.validation.constraints.Size( + max = 255, + message = "Queue name must not exceed 255 characters long." + ) + @JsonProperty("name") + @JsonPropertyDescription("The name of the queue. It MUST NOT exceed 255 characters long.") + private String name; + + /** + * Whether the queue should survive broker restarts or not. + */ + @Nullable + @JsonProperty("durable") + @JsonPropertyDescription("Whether the queue should survive broker restarts or not.") + private Boolean durable; + + /** + * Whether the queue should be used only by one connection or not. + */ + @Nullable + @JsonProperty("exclusive") + @JsonPropertyDescription("Whether the queue should be used only by one connection or not.") + private Boolean exclusive; + + /** + * Whether the queue should be deleted when the last consumer unsubscribes. + */ + @Nullable + @JsonProperty("autoDelete") + @JsonPropertyDescription("Whether the queue should be deleted when the last consumer unsubscribes.") + private Boolean autoDelete; + + /** + * The virtual host of the queue. Defaults to /. + */ + @Nullable + @Builder.Default + @JsonProperty(value = "vhost", defaultValue = "/") + @JsonPropertyDescription("The virtual host of the queue. Defaults to /.") + private String vhost = "/"; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java new file mode 100644 index 00000000..199cee94 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java @@ -0,0 +1,52 @@ +package com.asyncapi.bindings.amqp.v0._3_0.message; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes AMQP 0-9-1 message binding. + *

+ * Contains information about the message representation in AMQP. + * + * @version 0.3.0 + * @see AMQP message binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes AMQP 0-9-1 message binding.") +public class AMQPMessageBinding extends com.asyncapi.bindings.amqp.AMQPMessageBinding { + + /** + * A MIME encoding for the message content. + */ + @Nullable + @JsonProperty("contentEncoding") + @JsonPropertyDescription("A MIME encoding for the message content.") + private String contentEncoding; + + /** + * Application-specific message type. + */ + @Nullable + @JsonProperty("messageType") + @JsonPropertyDescription("Application-specific message type.") + private String messageType; + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java new file mode 100644 index 00000000..e49efe4b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java @@ -0,0 +1,140 @@ +package com.asyncapi.bindings.amqp.v0._3_0.operation; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * Describes AMQP 0-9-1 operation binding. + *

+ * Contains information about the operation representation in AMQP. + * + * @version 0.3.0 + * @see AMQP operation binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes AMQP 0-9-1 operation binding.") +public class AMQPOperationBinding extends com.asyncapi.bindings.amqp.AMQPOperationBinding { + + /** + * TTL (Time-To-Live) for the message. It MUST be greater than or equal to zero. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @javax.validation.constraints.Min( + value = 0, + message = "TTL (Time-To-Live) for the message must be greater than or equal to zero" + ) + @JsonProperty("expiration") + @JsonPropertyDescription("TTL (Time-To-Live) for the message. It MUST be greater than or equal to zero.") + private Integer expiration; + + /** + * Identifies the user who has sent the message. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("userId") + @JsonPropertyDescription("Identifies the user who has sent the message.") + private String userId; + + /** + * The routing keys the message should be routed to at the time of publishing. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("cc") + @JsonPropertyDescription("The routing keys the message should be routed to at the time of publishing.") + private List cc; + + /** + * A priority for the message. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("priority") + @JsonPropertyDescription("A priority for the message.") + private Integer priority; + + /** + * Delivery mode of the message. Its value MUST be either 1 (transient) or 2 (persistent). + *

+ * Applies to: publish, subscribe + */ + @Nullable + @javax.validation.constraints.Min( + value = 1, + message = "Delivery mode of the message must be either 1 (transient) or 2 (persistent)" + ) + @javax.validation.constraints.Max( + value = 2, + message = "Delivery mode of the message must be either 1 (transient) or 2 (persistent)" + ) + @JsonProperty("deliveryMode") + @JsonPropertyDescription("Delivery mode of the message. Its value MUST be either 1 (transient) or 2 (persistent).") + private Integer deliveryMode; + + /** + * Whether the message is mandatory or not. + *

+ * Applies to: publish + */ + @Nullable + @JsonProperty("mandatory") + @JsonPropertyDescription("Whether the message is mandatory or not.") + private Boolean mandatory; + + /** + * Like {@link #cc} but consumers will not receive this information. + *

+ * Applies to: publish + */ + @Nullable + @JsonProperty("bcc") + @JsonPropertyDescription("Like cc but consumers will not receive this information.") + private List bcc; + + /** + * Whether the message should include a timestamp or not. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("timestamp") + @JsonPropertyDescription("Whether the message should include a timestamp or not.") + private Boolean timestamp; + + /** + * Whether the consumer should ack the message or not. + *

+ * Applies to: subscribe + */ + @Nullable + @JsonProperty("ack") + @JsonPropertyDescription("Whether the consumer should ack the message or not.") + private Boolean ack; + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/server/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/server/AMQPServerBinding.java new file mode 100644 index 00000000..c358e110 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/server/AMQPServerBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.amqp.v0._3_0.server; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes AMQP 0-9-1 server binding. + * + * @version 0.3.0 + * @see AMQP server binding + * @author Pavel Bodiachevskii + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class AMQPServerBinding extends com.asyncapi.bindings.amqp.AMQPServerBinding { + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQP.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQP.java new file mode 100644 index 00000000..96fcda09 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQP.java @@ -0,0 +1,10 @@ +package com.asyncapi.bindings.amqp; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("AMQP") +@SelectPackages("com.asyncapi.bindings.amqp") +public class AMQP {} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPLatestTest.java new file mode 100644 index 00000000..c0ae94ed --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding; +import com.asyncapi.bindings.amqp.v0._3_0.message.AMQPMessageBinding; +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding; +import com.asyncapi.bindings.amqp.v0._3_0.server.AMQPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class AMQPLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = AMQPV0_3_0Test.channelBinding();; + super.bindingTypeClass = AMQPChannelBinding.class; + super.pathToBindingJson = "/bindings/amqp/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = AMQPV0_3_0Test.messageBinding();; + super.bindingTypeClass = AMQPMessageBinding.class; + super.pathToBindingJson = "/bindings/amqp/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = AMQPV0_3_0Test.operationBinding();; + super.bindingTypeClass = AMQPOperationBinding.class; + super.pathToBindingJson = "/bindings/amqp/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = AMQPV0_3_0Test.serverBinding();; + super.bindingTypeClass = AMQPServerBinding.class; + super.pathToBindingJson = "/bindings/amqp/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPUnknownVersionTest.java new file mode 100644 index 00000000..b6e1de19 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding; +import com.asyncapi.bindings.amqp.v0._3_0.message.AMQPMessageBinding; +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding; +import com.asyncapi.bindings.amqp.v0._3_0.server.AMQPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class AMQPUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = AMQPV0_3_0Test.channelBinding(); + super.bindingTypeClass = AMQPChannelBinding.class; + super.pathToBindingJson = "/bindings/amqp/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = AMQPV0_3_0Test.messageBinding(); + super.bindingTypeClass = AMQPMessageBinding.class; + super.pathToBindingJson = "/bindings/amqp/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = AMQPV0_3_0Test.operationBinding(); + super.bindingTypeClass = AMQPOperationBinding.class; + super.pathToBindingJson = "/bindings/amqp/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = AMQPV0_3_0Test.serverBinding(); + super.bindingTypeClass = AMQPServerBinding.class; + super.pathToBindingJson = "/bindings/amqp/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_1_0Test.java new file mode 100644 index 00000000..9cb3fea7 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_1_0Test.java @@ -0,0 +1,106 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp.v0._1_0.channel.AMQPChannelBinding; +import com.asyncapi.bindings.amqp.v0._1_0.channel.AMQPChannelType; +import com.asyncapi.bindings.amqp.v0._1_0.channel.exchange.AMQPChannelExchangeProperties; +import com.asyncapi.bindings.amqp.v0._1_0.channel.exchange.AMQPChannelExchangeType; +import com.asyncapi.bindings.amqp.v0._1_0.channel.queue.AMQPChannelQueueProperties; +import com.asyncapi.bindings.amqp.v0._1_0.message.AMQPMessageBinding; +import com.asyncapi.bindings.amqp.v0._1_0.operation.AMQPOperationBinding; +import com.asyncapi.bindings.amqp.v0._1_0.server.AMQPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.1.0") +public class AMQPV0_1_0Test { + + public static AMQPChannelBinding channelBinding () { + return AMQPChannelBinding.builder() + .is(AMQPChannelType.ROUTING_KEY) + .queue(AMQPChannelQueueProperties.builder() + .name("my-queue-name") + .durable(true) + .exclusive(true) + .autoDelete(false) + .build() + ) + .exchange(AMQPChannelExchangeProperties.builder() + .name("myExchange") + .type(AMQPChannelExchangeType.TOPIC) + .durable(true) + .autoDelete(false) + .build() + ) + .build(); + } + + public static AMQPMessageBinding messageBinding () { + return AMQPMessageBinding.builder() + .contentEncoding("gzip") + .messageType("user.signup") + .build(); + } + + public static AMQPOperationBinding operationBinding () { + return AMQPOperationBinding.builder() + .expiration(100_000) + .userId("guest") + .cc(List.of("user.logs")) + .priority(10) + .deliveryMode(2) + .mandatory(false) + .bcc(List.of("external.audit")) + .replyTo("user.signedup") + .timestamp(true) + .ack(false) + .build(); + } + + public static AMQPServerBinding serverBinding () { + return new AMQPServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = AMQPChannelBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = AMQPMessageBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = AMQPOperationBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = AMQPServerBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_2_0Test.java new file mode 100644 index 00000000..4c561fcc --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_2_0Test.java @@ -0,0 +1,106 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding; +import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType; +import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeProperties; +import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeType; +import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties; +import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding; +import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding; +import com.asyncapi.bindings.amqp.v0._2_0.server.AMQPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.2.0") +public class AMQPV0_2_0Test { + + public static AMQPChannelBinding channelBinding () { + return AMQPChannelBinding.builder() + .is(AMQPChannelType.ROUTING_KEY) + .queue(AMQPChannelQueueProperties.builder() + .name("my-queue-name") + .durable(true) + .exclusive(true) + .autoDelete(false) + .build() + ) + .exchange(AMQPChannelExchangeProperties.builder() + .name("myExchange") + .type(AMQPChannelExchangeType.TOPIC) + .durable(true) + .autoDelete(false) + .build() + ) + .build(); + } + + public static AMQPMessageBinding messageBinding () { + return AMQPMessageBinding.builder() + .contentEncoding("gzip") + .messageType("user.signup") + .build(); + } + + public static AMQPOperationBinding operationBinding () { + return AMQPOperationBinding.builder() + .expiration(100_000) + .userId("guest") + .cc(List.of("user.logs")) + .priority(10) + .deliveryMode(2) + .mandatory(false) + .bcc(List.of("external.audit")) + .replyTo("user.signedup") + .timestamp(true) + .ack(false) + .build(); + } + + public static AMQPServerBinding serverBinding () { + return new AMQPServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = AMQPChannelBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.2.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.2.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.2.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = AMQPMessageBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.2.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.2.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.2.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = AMQPOperationBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.2.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.2.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.2.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = AMQPServerBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.2.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.2.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.2.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_3_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_3_0Test.java new file mode 100644 index 00000000..8f11a12a --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPV0_3_0Test.java @@ -0,0 +1,105 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding; +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType; +import com.asyncapi.bindings.amqp.v0._3_0.channel.exchange.AMQPChannelExchangeProperties; +import com.asyncapi.bindings.amqp.v0._3_0.channel.exchange.AMQPChannelExchangeType; +import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties; +import com.asyncapi.bindings.amqp.v0._3_0.message.AMQPMessageBinding; +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding; +import com.asyncapi.bindings.amqp.v0._3_0.server.AMQPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.3.0") +public class AMQPV0_3_0Test { + + public static AMQPChannelBinding channelBinding () { + return AMQPChannelBinding.builder() + .is(AMQPChannelType.ROUTING_KEY) + .queue(AMQPChannelQueueProperties.builder() + .name("my-queue-name") + .durable(true) + .exclusive(true) + .autoDelete(false) + .build() + ) + .exchange(AMQPChannelExchangeProperties.builder() + .name("myExchange") + .type(AMQPChannelExchangeType.TOPIC) + .durable(true) + .autoDelete(false) + .build() + ) + .build(); + } + + public static AMQPMessageBinding messageBinding () { + return AMQPMessageBinding.builder() + .contentEncoding("gzip") + .messageType("user.signup") + .build(); + } + + public static AMQPOperationBinding operationBinding () { + return AMQPOperationBinding.builder() + .expiration(100_000) + .userId("guest") + .cc(List.of("user.logs")) + .priority(10) + .deliveryMode(2) + .mandatory(false) + .bcc(List.of("external.audit")) + .timestamp(true) + .ack(false) + .build(); + } + + public static AMQPServerBinding serverBinding () { + return new AMQPServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = AMQPChannelBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.3.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.3.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.3.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = AMQPMessageBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.3.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.3.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.3.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = AMQPOperationBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.3.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.3.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.3.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = AMQPServerBinding.class; + super.pathToBindingJson = "/bindings/amqp/0.3.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/0.3.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/0.3.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPWithoutVersionTest.java new file mode 100644 index 00000000..62ac530c --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/AMQPWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.amqp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding; +import com.asyncapi.bindings.amqp.v0._3_0.message.AMQPMessageBinding; +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding; +import com.asyncapi.bindings.amqp.v0._3_0.server.AMQPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class AMQPWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = AMQPV0_3_0Test.channelBinding(); + super.bindingTypeClass = AMQPChannelBinding.class; + super.pathToBindingJson = "/bindings/amqp/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = AMQPV0_3_0Test.messageBinding(); + super.bindingTypeClass = AMQPMessageBinding.class; + super.pathToBindingJson = "/bindings/amqp/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = AMQPV0_3_0Test.operationBinding(); + super.bindingTypeClass = AMQPOperationBinding.class; + super.pathToBindingJson = "/bindings/amqp/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = AMQPV0_3_0Test.serverBinding(); + super.bindingTypeClass = AMQPServerBinding.class; + super.pathToBindingJson = "/bindings/amqp/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/amqp/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/amqp/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt deleted file mode 100644 index 26396c43..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBindingTest.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.asyncapi.bindings.amqp.v0._2_0.channel - -import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeProperties -import com.asyncapi.bindings.amqp.v0._2_0.channel.exchange.AMQPChannelExchangeType -import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class AMQPChannelBindingTest: SerDeTest() { - - override fun objectClass() = AMQPChannelBinding::class.java - - override fun baseObjectJson() = "/bindings/amqp/channel/amqpChannelBinding.json" - - override fun extendedObjectJson() = "/bindings/amqp/channel/amqpChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/amqp/channel/amqpChannelBinding - wrongly extended.json" - - override fun build(): AMQPChannelBinding { - return AMQPChannelBinding.builder() - .`is`(AMQPChannelType.ROUTING_KEY) - .queue(AMQPChannelQueueProperties.builder() - .name("my-queue-name") - .durable(true) - .exclusive(true) - .autoDelete(false) - .build() - ) - .exchange(AMQPChannelExchangeProperties.builder() - .name("myExchange") - .type(AMQPChannelExchangeType.TOPIC) - .durable(true) - .autoDelete(false) - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt deleted file mode 100644 index 2191fe00..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBindingTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.asyncapi.bindings.amqp.v0._2_0.message - -import com.asyncapi.v3.SerDeTest - -class AMQPMessageBindingTest: SerDeTest() { - - override fun objectClass() = AMQPMessageBinding::class.java - - override fun baseObjectJson() = "/bindings/amqp/message/amqpMessageBinding.json" - - override fun extendedObjectJson() = "/bindings/amqp/message/amqpMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/amqp/message/amqpMessageBinding - wrongly extended.json" - - override fun build(): AMQPMessageBinding { - return AMQPMessageBinding.builder() - .contentEncoding("gzip") - .messageType("user.signup") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt deleted file mode 100644 index 356e0a0c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBindingTest.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.asyncapi.bindings.amqp.v0._2_0.operation - -import com.asyncapi.v3.SerDeTest - -class AMQPOperationBindingTest: SerDeTest() { - - override fun objectClass() = AMQPOperationBinding::class.java - - override fun baseObjectJson() = "/bindings/amqp/operation/amqpOperationBinding.json" - - override fun extendedObjectJson() = "/bindings/amqp/operation/amqpOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/amqp/operation/amqpOperationBinding - wrongly extended.json" - - override fun build(): AMQPOperationBinding { - return AMQPOperationBinding.builder() - .expiration(100_000) - .userId("guest") - .cc(listOf("user.logs")) - .priority(10) - .deliveryMode(2) - .mandatory(false) - .bcc(listOf("external.audit")) - .replyTo("user.signedup") - .timestamp(true) - .ack(false) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt index 669644e0..f406d78b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt @@ -8,10 +8,10 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType -import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding import com.asyncapi.v2.schema.Schema class RpcClient: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt index 20fd2450..7f266767 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt @@ -8,10 +8,10 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType -import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding import com.asyncapi.v2.schema.Schema class RpcServer: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt index 2b2abed8..17f6f40a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt @@ -8,10 +8,10 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType -import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding import com.asyncapi.v2.schema.Schema class RpcClient: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt index a25c741f..a62ee78e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt @@ -8,10 +8,10 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType -import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding import com.asyncapi.v2.schema.Schema class RpcServer: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt index 56e2cd70..1d0a514a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt @@ -10,10 +10,10 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType -import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding import com.asyncapi.v3.schema.AsyncAPISchema class RpcClientAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt index c84361a5..efc3e077 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt @@ -10,10 +10,10 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelType -import com.asyncapi.bindings.amqp.v0._2_0.channel.queue.AMQPChannelQueueProperties -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding +import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType +import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties +import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding import com.asyncapi.v3.schema.AsyncAPISchema class RpcServerAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index d4d4b595..74bcd332 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2._0_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._0_0.model.channel.operation.OperationWithReferenceToMessageTest import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.ChannelBinding -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest @@ -55,7 +55,7 @@ class ChannelItemTest: SerDeTest() { companion object { fun bindings(): Map { return mapOf( - Pair("amqp", AMQPChannelBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", AMQP1ChannelBinding()), Pair("anypointmq", AnypointMQChannelBindingTest().build()), Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 1482e4a9..1bc03805 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.MessageBinding -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest @@ -114,7 +114,7 @@ class MessageTest: SerDeTest() { companion object { fun bindings(): Map { return mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", AMQP1MessageBinding()), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 5ba3cd3d..a6b382cf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest @@ -73,7 +73,7 @@ class MessageTraitTest: SerDeTest() { )) .externalDocs(ExternalDocumentation("User sign up rules", "messages/sign-up-rules")) .bindings(mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", AMQP1MessageBinding()), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index a7865936..5ae29c36 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.message.MessageTest import com.asyncapi.bindings.OperationBinding -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding @@ -101,7 +101,7 @@ class OperationTest { @JvmStatic fun bindings(): Map { return mapOf( - Pair("amqp", AMQPOperationBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", AMQP1OperationBinding()), Pair("anypointmq", AnypointMQOperationBinding()), Pair("googlepubsub", GooglePubSubOperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index edaaf32c..05a06df0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v2._0_0.model.channel.operation import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.Tag -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding @@ -50,7 +50,7 @@ class OperationTraitTest: SerDeTest() { )) .externalDocs(ExternalDocumentation("Messages sending rules", "messages/sending-rules")) .bindings(mapOf( - Pair("amqp", AMQPOperationBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", AMQP1OperationBinding()), Pair("anypointmq", AnypointMQOperationBinding()), Pair("googlepubsub", GooglePubSubOperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index babcdfdb..9ad25aad 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTest import com.asyncapi.v2.schema.Schema -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest @@ -44,7 +44,7 @@ class ChannelItemTest: SerDeTest() { companion object { fun bindings(): Map { return mapOf( - Pair("amqp", AMQPChannelBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", Reference("#/components/channelBindings/amqp1")), Pair("anypointmq", AnypointMQChannelBindingTest().build()), Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index e5cc196b..b36c738c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest @@ -88,7 +88,7 @@ class MessageTest: SerDeTest() { companion object { fun bindings(): Map { return mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 8d818abf..4a570ef7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest @@ -60,7 +60,7 @@ class MessageTraitTest: SerDeTest() { )) .externalDocs(ExternalDocumentation("User sign up rules", "messages/sign-up-rules")) .bindings(mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 91129647..52240074 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.message.MessageTest import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest @@ -136,7 +136,7 @@ class OperationTest { @JvmStatic fun bindings(): Map { return mapOf( - Pair("amqp", AMQPOperationBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 93ad9962..519c679c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest @@ -40,7 +40,7 @@ class OperationTraitTest: SerDeTest() { )) .externalDocs(ExternalDocumentation("Messages sending rules", "messages/sending-rules")) .bindings(mapOf( - Pair("amqp", AMQPOperationBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index cbdda007..69714add 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v3._0_0.model.TagTestWithReferenceToExternalDocs import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithMultiFormatSchema import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithReference import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithSchema -import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest @@ -64,7 +64,7 @@ class ChannelTest: SerDeTest() { companion object { fun bindings(): Map { return mapOf( - Pair("amqp", AMQPChannelBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", Reference("#/components/channelBindings/amqp1")), Pair("anypointmq", AnypointMQChannelBindingTest().build()), Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), @@ -137,7 +137,7 @@ class ChannelTestWithReference: SerDeTest() { companion object { fun bindings(): Map { return mapOf( - Pair("amqp", AMQPChannelBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", Reference("#/components/channelBindings/amqp1")), Pair("anypointmq", AnypointMQChannelBindingTest().build()), Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 40b353fb..74d57c49 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest @@ -84,7 +84,7 @@ class MessageTestWithSchema: SerDeTest() { companion object { fun bindings(): Map { return mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), @@ -137,7 +137,7 @@ class MessageTestWithReference: SerDeTest() { )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), @@ -227,7 +227,7 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 4e0a823c..7afb32c1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest @@ -59,7 +59,7 @@ class MessageTraitTestWithSchema: SerDeTest() { )) .externalDocs(ExternalDocumentation("User sign up rules", "messages/sign-up-rules")) .bindings(mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), @@ -114,7 +114,7 @@ class MessageTraitTestWithReference: SerDeTest() { )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), @@ -186,7 +186,7 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( - Pair("amqp", AMQPMessageBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQMessageBindingTest().build()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 94ff2dbd..5d1ac7c9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest @@ -63,7 +63,7 @@ class OperationTest: SerDeTest() { companion object { fun bindings(): Map { return mapOf( - Pair("amqp", AMQPOperationBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq") @@ -121,7 +121,7 @@ class OperationTestWithReference: SerDeTest() { )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( - Pair("amqp", AMQPOperationBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index b477904e..4b643d7c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation -import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBindingTest +import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest @@ -43,7 +43,7 @@ class OperationTraitTest: SerDeTest() { )) .externalDocs(ExternalDocumentation("Messages validation rules", "messages/validation-rules")) .bindings(mapOf( - Pair("amqp", AMQPOperationBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq") @@ -103,7 +103,7 @@ class OperationTraitTestWithReference: SerDeTest() { )) .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( - Pair("amqp", AMQPOperationBindingTest().build()), + Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", Reference("#/components/operationBindings/amqp1")), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq") diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding - extended.json new file mode 100644 index 00000000..1c659ddd --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.1.0", + "is" : "routingKey", + "exchange" : { + "name" : "myExchange", + "type" : "topic", + "durable" : true, + "autoDelete" : false + }, + "queue" : { + "name" : "my-queue-name", + "durable" : true, + "exclusive" : true, + "autoDelete" : false + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..111cd753 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false + }, + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding.json new file mode 100644 index 00000000..06ac7dda --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/channel/binding.json @@ -0,0 +1,16 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false + }, + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding - extended.json new file mode 100644 index 00000000..6673d9d8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.1.0", + "contentEncoding" : "gzip", + "messageType" : "user.signup", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..61f8b5f8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup", + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding.json new file mode 100644 index 00000000..5e4323a4 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/message/binding.json @@ -0,0 +1,5 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup", + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding - extended.json new file mode 100644 index 00000000..0ad32381 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.1.0", + "expiration" : 100000, + "userId" : "guest", + "cc" : [ "user.logs" ], + "priority" : 10, + "deliveryMode" : 2, + "mandatory" : false, + "bcc" : [ "external.audit" ], + "replyTo" : "user.signedup", + "timestamp" : true, + "ack" : false, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..b965b215 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding - wrongly extended.json @@ -0,0 +1,23 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "replyTo": "user.signedup", + "timestamp": true, + "ack": false, + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding.json new file mode 100644 index 00000000..cac652d9 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/operation/binding.json @@ -0,0 +1,17 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "replyTo": "user.signedup", + "timestamp": true, + "ack": false, + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.1.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/0.2.0/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/0.2.0/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/amqp/channel/amqpChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/amqp/0.2.0/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/0.2.0/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/0.2.0/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/amqp/message/amqpMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/amqp/0.2.0/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/0.2.0/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/amqp/0.2.0/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/amqp/operation/amqpOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/amqp/0.2.0/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.2.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding - extended.json new file mode 100644 index 00000000..0711c55c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding - extended.json @@ -0,0 +1,23 @@ +{ + "bindingVersion" : "0.3.0", + "is" : "routingKey", + "exchange" : { + "name" : "myExchange", + "type" : "topic", + "durable" : true, + "autoDelete" : false, + "vhost" : "/" + }, + "queue" : { + "name" : "my-queue-name", + "durable" : true, + "exclusive" : true, + "autoDelete" : false, + "vhost" : "/" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..4168c470 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding - wrongly extended.json @@ -0,0 +1,24 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false, + "vhost": "/" + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false, + "vhost": "/" + }, + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding.json new file mode 100644 index 00000000..06cff58b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/channel/binding.json @@ -0,0 +1,18 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false, + "vhost": "/" + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false, + "vhost": "/" + }, + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding - extended.json new file mode 100644 index 00000000..730ae10b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.3.0", + "contentEncoding" : "gzip", + "messageType" : "user.signup", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..e58030ff --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup", + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding.json new file mode 100644 index 00000000..5cb3ca90 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/message/binding.json @@ -0,0 +1,5 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup", + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding - extended.json new file mode 100644 index 00000000..a055dd28 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.3.0", + "expiration" : 100000, + "userId" : "guest", + "cc" : [ "user.logs" ], + "priority" : 10, + "deliveryMode" : 2, + "mandatory" : false, + "bcc" : [ "external.audit" ], + "timestamp" : true, + "ack" : false, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..61ff2d82 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "timestamp": true, + "ack": false, + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding.json new file mode 100644 index 00000000..2c8ab4b6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/operation/binding.json @@ -0,0 +1,16 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "timestamp": true, + "ack": false, + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..943a1361 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding.json new file mode 100644 index 00000000..4c2843f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/0.3.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding - extended.json new file mode 100644 index 00000000..0711c55c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding - extended.json @@ -0,0 +1,23 @@ +{ + "bindingVersion" : "0.3.0", + "is" : "routingKey", + "exchange" : { + "name" : "myExchange", + "type" : "topic", + "durable" : true, + "autoDelete" : false, + "vhost" : "/" + }, + "queue" : { + "name" : "my-queue-name", + "durable" : true, + "exclusive" : true, + "autoDelete" : false, + "vhost" : "/" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a0131c3f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding - wrongly extended.json @@ -0,0 +1,24 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false, + "vhost": "/" + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false, + "vhost": "/" + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding.json new file mode 100644 index 00000000..b0d109fa --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/channel/binding.json @@ -0,0 +1,18 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false, + "vhost": "/" + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false, + "vhost": "/" + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding - extended.json new file mode 100644 index 00000000..730ae10b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.3.0", + "contentEncoding" : "gzip", + "messageType" : "user.signup", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..95b801a2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup", + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding.json new file mode 100644 index 00000000..e48dc6d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/message/binding.json @@ -0,0 +1,5 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup", + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding - extended.json new file mode 100644 index 00000000..a055dd28 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.3.0", + "expiration" : 100000, + "userId" : "guest", + "cc" : [ "user.logs" ], + "priority" : 10, + "deliveryMode" : 2, + "mandatory" : false, + "bcc" : [ "external.audit" ], + "timestamp" : true, + "ack" : false, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..3b31654e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "timestamp": true, + "ack": false, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding.json new file mode 100644 index 00000000..6b6c209f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/operation/binding.json @@ -0,0 +1,16 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "timestamp": true, + "ack": false, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/latest/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..0711c55c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding - extended.json @@ -0,0 +1,23 @@ +{ + "bindingVersion" : "0.3.0", + "is" : "routingKey", + "exchange" : { + "name" : "myExchange", + "type" : "topic", + "durable" : true, + "autoDelete" : false, + "vhost" : "/" + }, + "queue" : { + "name" : "my-queue-name", + "durable" : true, + "exclusive" : true, + "autoDelete" : false, + "vhost" : "/" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..b618ccb6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,24 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false, + "vhost": "/" + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false, + "vhost": "/" + }, + "bindingVersion": "0.199.6", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding.json new file mode 100644 index 00000000..7251f3d3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/channel/binding.json @@ -0,0 +1,18 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false, + "vhost": "/" + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false, + "vhost": "/" + }, + "bindingVersion": "0.199.6" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding - extended.json new file mode 100644 index 00000000..730ae10b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.3.0", + "contentEncoding" : "gzip", + "messageType" : "user.signup", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..af71946d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup", + "bindingVersion": "0.199.6", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding.json new file mode 100644 index 00000000..2129134e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/message/binding.json @@ -0,0 +1,5 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup", + "bindingVersion": "0.199.6" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..a055dd28 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.3.0", + "expiration" : 100000, + "userId" : "guest", + "cc" : [ "user.logs" ], + "priority" : 10, + "deliveryMode" : 2, + "mandatory" : false, + "bcc" : [ "external.audit" ], + "timestamp" : true, + "ack" : false, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..d5e720fd --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "timestamp": true, + "ack": false, + "bindingVersion": "0.199.6", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding.json new file mode 100644 index 00000000..d30f2034 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/operation/binding.json @@ -0,0 +1,16 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "timestamp": true, + "ack": false, + "bindingVersion": "0.199.6" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..ab29a71c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.6", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding.json new file mode 100644 index 00000000..03d6b9e6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/unknown version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.6" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding - extended.json new file mode 100644 index 00000000..0711c55c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding - extended.json @@ -0,0 +1,23 @@ +{ + "bindingVersion" : "0.3.0", + "is" : "routingKey", + "exchange" : { + "name" : "myExchange", + "type" : "topic", + "durable" : true, + "autoDelete" : false, + "vhost" : "/" + }, + "queue" : { + "name" : "my-queue-name", + "durable" : true, + "exclusive" : true, + "autoDelete" : false, + "vhost" : "/" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..2bd1dd45 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding - wrongly extended.json @@ -0,0 +1,23 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false, + "vhost": "/" + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false, + "vhost": "/" + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding.json new file mode 100644 index 00000000..6a657317 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/channel/binding.json @@ -0,0 +1,17 @@ +{ + "is": "routingKey", + "queue": { + "name": "my-queue-name", + "durable": true, + "exclusive": true, + "autoDelete": false, + "vhost": "/" + }, + "exchange": { + "name": "myExchange", + "type": "topic", + "durable": true, + "autoDelete": false, + "vhost": "/" + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding - extended.json new file mode 100644 index 00000000..730ae10b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.3.0", + "contentEncoding" : "gzip", + "messageType" : "user.signup", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..b2e9e16d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding.json new file mode 100644 index 00000000..5a989f71 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/message/binding.json @@ -0,0 +1,4 @@ +{ + "contentEncoding": "gzip", + "messageType": "user.signup" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - extended.json new file mode 100644 index 00000000..a055dd28 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.3.0", + "expiration" : 100000, + "userId" : "guest", + "cc" : [ "user.logs" ], + "priority" : 10, + "deliveryMode" : 2, + "mandatory" : false, + "bcc" : [ "external.audit" ], + "timestamp" : true, + "ack" : false, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..61ff2d82 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "timestamp": true, + "ack": false, + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding.json new file mode 100644 index 00000000..74492aac --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding.json @@ -0,0 +1,15 @@ +{ + "expiration": 100000, + "userId": "guest", + "cc": [ + "user.logs" + ], + "priority": 10, + "deliveryMode": 2, + "mandatory": false, + "bcc": [ + "external.audit" + ], + "timestamp": true, + "ack": false +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/server/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/pom.xml b/pom.xml index ba543c30..8dea0cb0 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,13 @@ ${junit5.version} test + + org.junit.platform + junit-platform-suite-engine + 1.10.2 + test + + From 0ed0b0a2b1d15972da29506253256ea2d82d857c Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Fri, 26 Apr 2024 21:15:00 +0400 Subject: [PATCH 042/141] tests(bindings): Anypoint MQ 0.0.1 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/168 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../anypointmq/AnypointMQChannelBinding.java | 29 ++++++ .../anypointmq/AnypointMQMessageBinding.java | 30 +++++++ .../AnypointMQOperationBinding.java | 31 +++++++ .../anypointmq/AnypointMQServerBinding.java | 31 +++++++ .../channel/AnypointMQChannelBinding.java | 20 ++--- .../message/AnypointMQMessageBinding.java | 20 ++--- .../operation/AnypointMQOperationBinding.java | 15 +++- .../_0_1/server/AnypointMQServerBinding.java | 15 +++- .../bindings/anypointmq/AnypointMQ.java | 11 +++ .../anypointmq/AnypointMQLatestTest.java | 54 +++++++++++ .../AnypointMQUnknownVersionTest.java | 54 +++++++++++ .../anypointmq/AnypointMQV0_0_1Test.java | 89 +++++++++++++++++++ .../AnypointMQWithoutVersionTest.java | 54 +++++++++++ .../channel/AnypointMQChannelBindingTest.kt | 26 ------ .../message/AnypointMQMessageBindingTest.kt | 34 ------- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../v3/_0_0/model/channel/ChannelTest.kt | 6 +- .../_0_0/model/channel/message/MessageTest.kt | 8 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../channel/binding - extended.json} | 0 .../channel/binding - wrongly extended.json} | 0 .../channel/binding.json} | 0 .../message/binding - extended.json} | 0 .../message/binding - wrongly extended.json} | 0 .../message/binding.json} | 0 .../0.0.1/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../anypointmq/0.0.1/operation/binding.json | 3 + .../0.0.1/server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../anypointmq/0.0.1/server/binding.json | 3 + .../latest/channel/binding - extended.json | 10 +++ .../channel/binding - wrongly extended.json | 11 +++ .../anypointmq/latest/channel/binding.json | 5 ++ .../latest/message/binding - extended.json | 17 ++++ .../message/binding - wrongly extended.json | 18 ++++ .../anypointmq/latest/message/binding.json | 12 +++ .../latest/operation/binding - extended.json | 8 ++ .../binding - wrongly extended.json} | 0 .../latest/operation/binding.json} | 0 .../latest/server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json} | 0 .../latest/server/binding.json} | 0 .../channel/binding - extended.json | 10 +++ .../channel/binding - wrongly extended.json | 11 +++ .../unknown version/channel/binding.json | 5 ++ .../message/binding - extended.json | 17 ++++ .../message/binding - wrongly extended.json | 18 ++++ .../unknown version/message/binding.json | 12 +++ .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../unknown version/operation/binding.json | 3 + .../server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../unknown version/server/binding.json | 3 + .../channel/binding - extended.json | 10 +++ .../channel/binding - wrongly extended.json | 10 +++ .../without version/channel/binding.json | 4 + .../message/binding - extended.json | 17 ++++ .../message/binding - wrongly extended.json | 17 ++++ .../without version/message/binding.json | 11 +++ .../operation/binding - extended.json | 8 ++ .../binding - wrongly extended.json} | 0 .../without version/operation/binding.json} | 0 .../server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json} | 0 .../without version/server/binding.json} | 0 76 files changed, 783 insertions(+), 111 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQ.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt rename asyncapi-core/src/test/resources/bindings/anypointmq/{channel/anypointMQChannelBinding - extended.json => 0.0.1/channel/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/anypointmq/{channel/anypointMQChannelBinding - wrongly extended.json => 0.0.1/channel/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/anypointmq/{channel/anypointMQChannelBinding.json => 0.0.1/channel/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/anypointmq/{message/anypointMQMessageBinding - extended.json => 0.0.1/message/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/anypointmq/{message/anypointMQMessageBinding - wrongly extended.json => 0.0.1/message/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/anypointmq/{message/anypointMQMessageBinding.json => 0.0.1/message/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/latest/operation/binding - extended.json rename asyncapi-core/src/test/resources/bindings/{websockets/latest/message/webSocketsMessageBinding - wrongly extended.json => anypointmq/latest/operation/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/{websockets/latest/message/webSocketsMessageBinding.json => anypointmq/latest/operation/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/latest/server/binding - extended.json rename asyncapi-core/src/test/resources/bindings/{websockets/latest/operation/webSocketsOperationBinding - wrongly extended.json => anypointmq/latest/server/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/{websockets/latest/operation/webSocketsOperationBinding.json => anypointmq/latest/server/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/without version/operation/binding - extended.json rename asyncapi-core/src/test/resources/bindings/{websockets/without version/message/webSocketsMessageBinding - wrongly extended.json => anypointmq/without version/operation/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/{websockets/without version/message/webSocketsMessageBinding.json => anypointmq/without version/operation/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/anypointmq/without version/server/binding - extended.json rename asyncapi-core/src/test/resources/bindings/{websockets/without version/operation/webSocketsOperationBinding - wrongly extended.json => anypointmq/without version/server/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/{websockets/without version/operation/webSocketsOperationBinding.json => anypointmq/without version/server/binding.json} (100%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 4f9f317f..fc3070e7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.bindings.amqp.AMQPChannelBinding; import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; +import com.asyncapi.bindings.anypointmq.AnypointMQChannelBinding; import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding; import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 4c5e9b4d..8d66b76b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.bindings.amqp.AMQPMessageBinding; import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; +import com.asyncapi.bindings.anypointmq.AnypointMQMessageBinding; import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding; import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 931fcb31..056fab2c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.bindings.amqp.AMQPOperationBinding; import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; -import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; +import com.asyncapi.bindings.anypointmq.AnypointMQOperationBinding; import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding; import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index ef39d492..dcb8f755 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.bindings.amqp.AMQPServerBinding; import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; -import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; +import com.asyncapi.bindings.anypointmq.AnypointMQServerBinding; import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding; import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java new file mode 100644 index 00000000..060b1b93 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java @@ -0,0 +1,29 @@ +package com.asyncapi.bindings.anypointmq; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Anypoint MQ channel binding. + * + * @version 0.0.1 + * @see Anypoint MQ channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding.class, names = { + "0.0.1", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class AnypointMQChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java new file mode 100644 index 00000000..c928ae26 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java @@ -0,0 +1,30 @@ +package com.asyncapi.bindings.anypointmq; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.*; + +/** + * Describes Anypoint MQ message binding. + * + * @version 0.0.1 + * @see Anypoint MQ message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding.class, names = { + "0.0.1", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class AnypointMQMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java new file mode 100644 index 00000000..4b6b7adb --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.anypointmq; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * Describes Anypoint MQ operation binding. + * + * @version 0.0.1 + * @see Anypoint MQ operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding.class, names = { + "0.0.1", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class AnypointMQOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java new file mode 100644 index 00000000..85943a0d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.anypointmq; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * Describes Anypoint MQ server binding. + * + * @version 0.0.1 + * @see Anypoint MQ server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding.class, names = { + "0.0.1", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class AnypointMQServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java index eb682d22..bb63f1b4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.anypointmq.v0._0_1.channel; -import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -20,7 +19,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Anypoint MQ channel binding.") -public class AnypointMQChannelBinding extends ChannelBinding { +public class AnypointMQChannelBinding extends com.asyncapi.bindings.anypointmq.AnypointMQChannelBinding { /** * OPTIONAL, defaults to the channel name. @@ -46,13 +45,14 @@ public class AnypointMQChannelBinding extends ChannelBinding { @JsonPropertyDescription("The type of destination, which MUST be either exchange or queue or fifo-queue. SHOULD be specified to document the messaging model (publish/subscribe, point-to-point, strict message ordering) supported by this channel.") private AnypointMQChannelDestinationType destinationType = AnypointMQChannelDestinationType.QUEUE; - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.0.1"; + @Override + public String getBindingVersion() { + return "0.0.1"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.0.1"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java index fa9a3808..fed9ac8e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.anypointmq.v0._0_1.message; -import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; @@ -21,7 +20,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Anypoint MQ message binding.") -public class AnypointMQMessageBinding extends MessageBinding { +public class AnypointMQMessageBinding extends com.asyncapi.bindings.anypointmq.AnypointMQMessageBinding { /** * A Schema object containing the definitions for Anypoint MQ-specific headers (so-called protocol headers). @@ -33,13 +32,14 @@ public class AnypointMQMessageBinding extends MessageBinding { @JsonPropertyDescription("A Schema object containing the definitions for Anypoint MQ-specific headers (so-called protocol headers). This schema MUST be of type object and have a properties key. Examples of Anypoint MQ protocol headers are messageId and messageGroupId.") private AsyncAPISchema headers; - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.0.1"; + @Override + public String getBindingVersion() { + return "0.0.1"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.0.1"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java index b7b71bd1..dc539f96 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.anypointmq.v0._0_1.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class AnypointMQOperationBinding extends OperationBinding { +public class AnypointMQOperationBinding extends com.asyncapi.bindings.anypointmq.AnypointMQOperationBinding { + + @Override + public String getBindingVersion() { + return "0.0.1"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.0.1"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java index bf661903..e31ec742 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.anypointmq.v0._0_1.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class AnypointMQServerBinding extends ServerBinding { +public class AnypointMQServerBinding extends com.asyncapi.bindings.anypointmq.AnypointMQServerBinding { + + @Override + public String getBindingVersion() { + return "0.0.1"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.0.1"); + } + } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQ.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQ.java new file mode 100644 index 00000000..02a2953f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQ.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.anypointmq; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("Anypoint MQ") +@SelectPackages("com.asyncapi.bindings.anypointmq") +public class AnypointMQ { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQLatestTest.java new file mode 100644 index 00000000..b6ef2776 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.anypointmq; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class AnypointMQLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.channelBinding(); + super.bindingTypeClass = AnypointMQChannelBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.messageBinding(); + super.bindingTypeClass = AnypointMQMessageBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.operationBinding(); + super.bindingTypeClass = AnypointMQOperationBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.serverBinding(); + super.bindingTypeClass = AnypointMQServerBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQUnknownVersionTest.java new file mode 100644 index 00000000..2b2d22cc --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.anypointmq; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class AnypointMQUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.channelBinding(); + super.bindingTypeClass = AnypointMQChannelBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.messageBinding(); + super.bindingTypeClass = AnypointMQMessageBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.operationBinding(); + super.bindingTypeClass = AnypointMQOperationBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.serverBinding(); + super.bindingTypeClass = AnypointMQServerBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java new file mode 100644 index 00000000..1cfd533f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java @@ -0,0 +1,89 @@ +package com.asyncapi.bindings.anypointmq; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelDestinationType; +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.Map; + +@DisplayName("0.1.0") +public class AnypointMQV0_0_1Test { + + public static AnypointMQChannelBinding channelBinding () { + return AnypointMQChannelBinding.builder() + .destination("user-signup-exchg") + .destinationType(AnypointMQChannelDestinationType.EXCHANGE) + .build(); + } + + public static AnypointMQMessageBinding messageBinding () { + return AnypointMQMessageBinding.builder() + .headers(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(Map.ofEntries(Map.entry( + "correlationId", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Correlation ID set by application") + .build() + ))) + .build()) + .build(); + } + + public static AnypointMQOperationBinding operationBinding () { + return new AnypointMQOperationBinding(); + } + + public static AnypointMQServerBinding serverBinding () { + return new AnypointMQServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = AnypointMQChannelBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/0.0.1/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/0.0.1/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/0.0.1/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = AnypointMQMessageBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/0.0.1/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/0.0.1/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/0.0.1/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = AnypointMQOperationBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/0.0.1/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/0.0.1/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/0.0.1/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = AnypointMQServerBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/0.0.1/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/0.0.1/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/0.0.1/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQWithoutVersionTest.java new file mode 100644 index 00000000..ef1f3703 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.anypointmq; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class AnypointMQWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.channelBinding(); + super.bindingTypeClass = AnypointMQChannelBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.messageBinding(); + super.bindingTypeClass = AnypointMQMessageBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.operationBinding(); + super.bindingTypeClass = AnypointMQOperationBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = AnypointMQV0_0_1Test.serverBinding(); + super.bindingTypeClass = AnypointMQServerBinding.class; + super.pathToBindingJson = "/bindings/anypointmq/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/anypointmq/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/anypointmq/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt deleted file mode 100644 index e1f53a75..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBindingTest.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.asyncapi.bindings.anypointmq.v0._0_1.channel - -import com.asyncapi.v3.SerDeTest - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class AnypointMQChannelBindingTest: SerDeTest() { - - override fun objectClass() = AnypointMQChannelBinding::class.java - - override fun baseObjectJson() = "/bindings/anypointmq/channel/anypointMQChannelBinding.json" - - override fun extendedObjectJson() = "/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/anypointmq/channel/anypointMQChannelBinding - wrongly extended.json" - - override fun build(): AnypointMQChannelBinding { - return AnypointMQChannelBinding.builder() - .destination("user-signup-exchg") - .destinationType(AnypointMQChannelDestinationType.EXCHANGE) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt deleted file mode 100644 index 476f316c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBindingTest.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.asyncapi.bindings.anypointmq.v0._0_1.message - -import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.Type - -class AnypointMQMessageBindingTest: SerDeTest() { - - override fun objectClass() = AnypointMQMessageBinding::class.java - - override fun baseObjectJson() = "/bindings/anypointmq/message/anypointMQMessageBinding.json" - - override fun extendedObjectJson() = "/bindings/anypointmq/message/anypointMQMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/anypointmq/message/anypointMQMessageBinding - wrongly extended.json" - - override fun build(): AnypointMQMessageBinding { - return AnypointMQMessageBinding.builder() - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(mapOf( - Pair( - "correlationId", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Correlation ID set by application") - .build() - ) - )) - .build()) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 74bcd332..c7798aa1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.ChannelBinding import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest @@ -57,7 +57,7 @@ class ChannelItemTest: SerDeTest() { return mapOf( Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", AMQP1ChannelBinding()), - Pair("anypointmq", AnypointMQChannelBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), Pair("http", HTTPChannelBinding()), Pair("ibmmq", IBMMQChannelBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 1bc03805..5174c8ef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.MessageBinding import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest @@ -116,7 +116,7 @@ class MessageTest: SerDeTest() { return mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", AMQP1MessageBinding()), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index a6b382cf..77279d9d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest @@ -75,7 +75,7 @@ class MessageTraitTest: SerDeTest() { .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", AMQP1MessageBinding()), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 9ad25aad..2c6d2ffd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTest import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest @@ -46,7 +46,7 @@ class ChannelItemTest: SerDeTest() { return mapOf( Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", Reference("#/components/channelBindings/amqp1")), - Pair("anypointmq", AnypointMQChannelBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQChannelBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index b36c738c..ef15c8f1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest @@ -90,7 +90,7 @@ class MessageTest: SerDeTest() { return mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 4a570ef7..8d6576bd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest @@ -62,7 +62,7 @@ class MessageTraitTest: SerDeTest() { .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 69714add..836a9e2a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithMultiFormatSche import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithReference import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithSchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBindingTest +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest @@ -66,7 +66,7 @@ class ChannelTest: SerDeTest() { return mapOf( Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", Reference("#/components/channelBindings/amqp1")), - Pair("anypointmq", AnypointMQChannelBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQChannelBindingTest().build()), @@ -139,7 +139,7 @@ class ChannelTestWithReference: SerDeTest() { return mapOf( Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", Reference("#/components/channelBindings/amqp1")), - Pair("anypointmq", AnypointMQChannelBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQChannelBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 74d57c49..7c1bf465 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest @@ -86,7 +86,7 @@ class MessageTestWithSchema: SerDeTest() { return mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), @@ -139,7 +139,7 @@ class MessageTestWithReference: SerDeTest() { .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), @@ -229,7 +229,7 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 7afb32c1..83c572b7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBindingTest +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest @@ -61,7 +61,7 @@ class MessageTraitTestWithSchema: SerDeTest() { .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), @@ -116,7 +116,7 @@ class MessageTraitTestWithReference: SerDeTest() { .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), @@ -188,7 +188,7 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), - Pair("anypointmq", AnypointMQMessageBindingTest().build()), + Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/anypointmq/channel/anypointMQChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/anypointmq/message/anypointMQMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding - wrongly extended.json new file mode 100644 index 00000000..e060a0ea --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.0.1", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding.json new file mode 100644 index 00000000..be81020d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.0.1" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding - wrongly extended.json new file mode 100644 index 00000000..e060a0ea --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.0.1", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding.json new file mode 100644 index 00000000..be81020d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/0.0.1/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.0.1" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding - extended.json new file mode 100644 index 00000000..41b3abd8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.0.1", + "destination" : "user-signup-exchg", + "destinationType" : "exchange", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..da7576ee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "destination": "user-signup-exchg", + "destinationType": "exchange", + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding.json new file mode 100644 index 00000000..e51a884e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/channel/binding.json @@ -0,0 +1,5 @@ +{ + "destination": "user-signup-exchg", + "destinationType": "exchange", + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding - extended.json new file mode 100644 index 00000000..8ea89356 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.0.1", + "headers" : { + "type" : "object", + "properties" : { + "correlationId" : { + "type" : "string", + "description" : "Correlation ID set by application" + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..017374e0 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "headers": { + "type": "object", + "properties": { + "correlationId": { + "description": "Correlation ID set by application", + "type": "string" + } + } + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding.json new file mode 100644 index 00000000..22ec5c25 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/message/binding.json @@ -0,0 +1,12 @@ +{ + "headers": { + "type": "object", + "properties": { + "correlationId": { + "description": "Correlation ID set by application", + "type": "string" + } + } + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/operation/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/latest/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/latest/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/server/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/latest/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/latest/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/latest/server/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..41b3abd8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.0.1", + "destination" : "user-signup-exchg", + "destinationType" : "exchange", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..ff3d9383 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "destination": "user-signup-exchg", + "destinationType": "exchange", + "bindingVersion": "0.996.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding.json new file mode 100644 index 00000000..c726ed72 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/channel/binding.json @@ -0,0 +1,5 @@ +{ + "destination": "user-signup-exchg", + "destinationType": "exchange", + "bindingVersion": "0.996.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding - extended.json new file mode 100644 index 00000000..8ea89356 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.0.1", + "headers" : { + "type" : "object", + "properties" : { + "correlationId" : { + "type" : "string", + "description" : "Correlation ID set by application" + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..b98053b4 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "headers": { + "type": "object", + "properties": { + "correlationId": { + "description": "Correlation ID set by application", + "type": "string" + } + } + }, + "bindingVersion": "0.996.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding.json new file mode 100644 index 00000000..217e1d59 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/message/binding.json @@ -0,0 +1,12 @@ +{ + "headers": { + "type": "object", + "properties": { + "correlationId": { + "description": "Correlation ID set by application", + "type": "string" + } + } + }, + "bindingVersion": "0.996.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..4355627d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.996.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding.json new file mode 100644 index 00000000..3bca743e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.996.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..4355627d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.996.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding.json new file mode 100644 index 00000000..3bca743e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/unknown version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.996.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding - extended.json new file mode 100644 index 00000000..41b3abd8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.0.1", + "destination" : "user-signup-exchg", + "destinationType" : "exchange", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..c9232e82 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "destination": "user-signup-exchg", + "destinationType": "exchange", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding.json new file mode 100644 index 00000000..05d00e61 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/channel/binding.json @@ -0,0 +1,4 @@ +{ + "destination": "user-signup-exchg", + "destinationType": "exchange" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding - extended.json new file mode 100644 index 00000000..8ea89356 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.0.1", + "headers" : { + "type" : "object", + "properties" : { + "correlationId" : { + "type" : "string", + "description" : "Correlation ID set by application" + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..138d4693 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding - wrongly extended.json @@ -0,0 +1,17 @@ +{ + "headers": { + "type": "object", + "properties": { + "correlationId": { + "description": "Correlation ID set by application", + "type": "string" + } + } + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding.json new file mode 100644 index 00000000..ac13a7cb --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/message/binding.json @@ -0,0 +1,11 @@ +{ + "headers": { + "type": "object", + "properties": { + "correlationId": { + "description": "Correlation ID set by application", + "type": "string" + } + } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/operation/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/without version/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/without version/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/anypointmq/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/server/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/without version/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/anypointmq/without version/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/anypointmq/without version/server/binding.json From e2ddf5fe212b6a85cca8c4223cbfaf811df6efdd Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sat, 27 Apr 2024 10:26:00 +0400 Subject: [PATCH 043/141] tests(bindings): Google Pub/Sub 0.1.0, 0.2.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/169 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../GooglePubSubChannelBinding.java | 30 +++++ .../GooglePubSubMessageBinding.java | 32 ++++++ .../GooglePubSubOperationBinding.java | 29 +++++ .../GooglePubSubServerBinding.java | 29 +++++ .../channel/GooglePubSubChannelBinding.java | 20 ++-- .../message/GooglePubSubMessageBinding.java | 20 ++-- .../GooglePubSubOperationBinding.java | 15 ++- .../server/GooglePubSubServerBinding.java | 15 ++- .../channel/GooglePubSubChannelBinding.java | 73 ++++++++++++ ...oglePubSubChannelMessageStoragePolicy.java | 36 ++++++ .../GooglePubSubChannelSchemaSettings.java | 59 ++++++++++ .../message/GooglePubSubMessageBinding.java | 62 +++++++++++ .../GooglePubSubMessageSchemaDefinition.java | 39 +++++++ .../GooglePubSubOperationBinding.java | 32 ++++++ .../server/GooglePubSubServerBinding.java | 32 ++++++ .../bindings/googlepubsub/GooglePubSub.java | 11 ++ .../googlepubsub/GooglePubSubLatestTest.java | 54 +++++++++ .../GooglePubSubUnknownVersionTest.java | 54 +++++++++ .../googlepubsub/GooglePubSubV0_1_0Test.java | 104 ++++++++++++++++++ .../googlepubsub/GooglePubSubV0_2_0Test.java | 101 +++++++++++++++++ .../GooglePubSubWithoutVersionTest.java | 59 ++++++++++ .../channel/GooglePubSubChannelBindingTest.kt | 42 ------- .../message/GooglePubSubMessageBindingTest.kt | 24 ---- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_0_0/model/server/ServerTest.kt | 4 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../v2/_6_0/model/server/ServerTest.kt | 4 +- .../v3/_0_0/model/channel/ChannelTest.kt | 6 +- .../_0_0/model/channel/message/MessageTest.kt | 8 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../v3/_0_0/model/server/ServerTest.kt | 6 +- .../channel/binding - extended.json} | 0 .../channel/binding - wrongly extended.json} | 0 .../channel/binding.json} | 0 .../message/binding - extended.json} | 0 .../message/binding - wrongly extended.json} | 0 .../message/binding.json} | 0 .../0.1.0/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../googlepubsub/0.1.0/operation/binding.json | 3 + .../0.1.0/server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../googlepubsub/0.1.0/server/binding.json | 3 + .../0.2.0/channel/binding - extended.json | 16 +++ .../channel/binding - wrongly extended.json | 29 +++++ .../googlepubsub/0.2.0/channel/binding.json | 23 ++++ .../0.2.0/message/binding - extended.json | 11 ++ .../message/binding - wrongly extended.json | 12 ++ .../googlepubsub/0.2.0/message/binding.json | 6 + .../0.2.0/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../googlepubsub/0.2.0/operation/binding.json | 3 + .../0.2.0/server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../googlepubsub/0.2.0/server/binding.json | 3 + .../latest/channel/binding - extended.json | 16 +++ .../channel/binding - wrongly extended.json | 29 +++++ .../googlepubsub/latest/channel/binding.json | 23 ++++ .../latest/message/binding - extended.json | 11 ++ .../message/binding - wrongly extended.json | 12 ++ .../googlepubsub/latest/message/binding.json | 6 + .../latest/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../latest/operation/binding.json | 3 + .../latest/server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../googlepubsub/latest/server/binding.json | 3 + .../channel/binding - extended.json | 16 +++ .../channel/binding - wrongly extended.json | 29 +++++ .../unknown version/channel/binding.json | 23 ++++ .../message/binding - extended.json | 11 ++ .../message/binding - wrongly extended.json | 12 ++ .../unknown version/message/binding.json | 6 + .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../unknown version/operation/binding.json | 3 + .../server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../unknown version/server/binding.json | 3 + .../channel/binding - extended.json | 16 +++ .../channel/binding - wrongly extended.json | 29 +++++ .../without version/channel/binding.json | 23 ++++ .../message/binding - extended.json | 11 ++ .../message/binding - wrongly extended.json | 12 ++ .../without version/message/binding.json | 6 + .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../without version/operation/binding.json | 3 + .../server/binding - extended.json | 8 ++ .../server/binding - wrongly extended.json | 9 ++ .../without version/server/binding.json | 3 + .../v2/2.0.0/model/asyncapi - extended.json | 64 ++++++++--- .../model/channel/channelItem - extended.json | 32 ++++-- .../operation with message - extended.json | 16 ++- ... with reference to message - extended.json | 16 ++- .../operation/operationTrait - extended.json | 8 +- .../components/components - extended.json | 24 +++- .../2.0.0/model/server/server - extended.json | 8 +- .../v2/2.6.0/model/asyncapi - extended.json | 24 +++- .../components/components - extended.json | 16 ++- .../2.6.0/model/server/server - extended.json | 8 +- .../v3/3.0.0/model/asyncapi - extended.json | 32 ++++-- .../components/components - extended.json | 16 ++- .../3.0.0/model/server/server - extended.json | 8 +- .../server with reference - extended.json | 8 +- 115 files changed, 1718 insertions(+), 198 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/operation/GooglePubSubOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/server/GooglePubSubServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSub.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubV0_2_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt rename asyncapi-core/src/test/resources/bindings/googlepubsub/{channel/googlePubSubChannelBinding - extended.json => 0.1.0/channel/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/googlepubsub/{channel/googlePubSubChannelBinding - wrongly extended.json => 0.1.0/channel/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/googlepubsub/{channel/googlePubSubChannelBinding.json => 0.1.0/channel/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/googlepubsub/{message/googlePubSubMessageBinding - extended.json => 0.1.0/message/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/googlepubsub/{message/googlePubSubMessageBinding - wrongly extended.json => 0.1.0/message/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/googlepubsub/{message/googlePubSubMessageBinding.json => 0.1.0/message/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index fc3070e7..470fb155 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -3,7 +3,7 @@ import com.asyncapi.bindings.amqp.AMQPChannelBinding; import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; import com.asyncapi.bindings.anypointmq.AnypointMQChannelBinding; -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding; +import com.asyncapi.bindings.googlepubsub.GooglePubSubChannelBinding; import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 8d66b76b..55adb396 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -3,7 +3,7 @@ import com.asyncapi.bindings.amqp.AMQPMessageBinding; import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; import com.asyncapi.bindings.anypointmq.AnypointMQMessageBinding; -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding; +import com.asyncapi.bindings.googlepubsub.GooglePubSubMessageBinding; import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 056fab2c..b45821b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -3,7 +3,7 @@ import com.asyncapi.bindings.amqp.AMQPOperationBinding; import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; import com.asyncapi.bindings.anypointmq.AnypointMQOperationBinding; -import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding; +import com.asyncapi.bindings.googlepubsub.GooglePubSubOperationBinding; import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index dcb8f755..230d94a0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -3,7 +3,7 @@ import com.asyncapi.bindings.amqp.AMQPServerBinding; import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; import com.asyncapi.bindings.anypointmq.AnypointMQServerBinding; -import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding; +import com.asyncapi.bindings.googlepubsub.GooglePubSubServerBinding; import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java new file mode 100644 index 00000000..b7e117cf --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java @@ -0,0 +1,30 @@ +package com.asyncapi.bindings.googlepubsub; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.*; +import lombok.*; + +/** + * Describes Google Cloud Pub/Sub channel binding. + *

+ * The Channel Bindings Object is used to describe the Google Cloud Pub/Sub specific Topic details with AsyncAPI. + * + * @see Google Cloud Pub/Sub channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.googlepubsub.v0._2_0.channel.GooglePubSubChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.googlepubsub.v0._2_0.channel.GooglePubSubChannelBinding.class, names = { + "0.2.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class GooglePubSubChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java new file mode 100644 index 00000000..b93ce35e --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.googlepubsub; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Google Cloud Pub/Sub message binding. + *

+ * The Message Binding Object is used to describe the Google Cloud Pub/Sub specific PubsubMessage details, alongside with + * pertintent parts of the Google Cloud Pub/Sub Schema Object, with AsyncAPI. + * + * @see Google Cloud Pub/Sub message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.googlepubsub.v0._2_0.message.GooglePubSubMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.googlepubsub.v0._2_0.message.GooglePubSubMessageBinding.class, names = { + "0.2.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class GooglePubSubMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java new file mode 100644 index 00000000..5501bdd0 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java @@ -0,0 +1,29 @@ +package com.asyncapi.bindings.googlepubsub; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Google Cloud Pub/Sub operation binding. + * + * @see Google Cloud Pub/Sub operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.googlepubsub.v0._2_0.operation.GooglePubSubOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.googlepubsub.v0._2_0.operation.GooglePubSubOperationBinding.class, names = { + "0.2.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class GooglePubSubOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java new file mode 100644 index 00000000..facb4ebc --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java @@ -0,0 +1,29 @@ +package com.asyncapi.bindings.googlepubsub; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Google Cloud Pub/Sub server binding. + * + * @see Google Cloud Pub/Sub server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.googlepubsub.v0._2_0.server.GooglePubSubServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.googlepubsub.v0._2_0.server.GooglePubSubServerBinding.class, names = { + "0.2.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class GooglePubSubServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java index 23205a95..564459c3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.googlepubsub.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -25,7 +24,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Google Cloud Pub/Sub channel binding.") -public class GooglePubSubChannelBinding extends ChannelBinding { +public class GooglePubSubChannelBinding extends com.asyncapi.bindings.googlepubsub.GooglePubSubChannelBinding { /** * The Google Cloud Pub/Sub Topic name. @@ -71,13 +70,14 @@ public class GooglePubSubChannelBinding extends ChannelBinding { @JsonPropertyDescription("Settings for validating messages published against a schema") private GooglePubSubChannelSchemaSettings schemaSettings = new GooglePubSubChannelSchemaSettings(); - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty(value = "bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java index 478765c9..d5369f8b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.googlepubsub.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -23,7 +22,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Google Cloud Pub/Sub message binding.") -public class GooglePubSubMessageBinding extends MessageBinding { +public class GooglePubSubMessageBinding extends com.asyncapi.bindings.googlepubsub.GooglePubSubMessageBinding { /** * If non-empty, identifies related messages for which publish order should be respected (For more information, see ordering messages.) @@ -50,13 +49,14 @@ public class GooglePubSubMessageBinding extends MessageBinding { @JsonPropertyDescription("Describes the schema used to validate the payload of this message") private GooglePubSubMessageSchemaDefinition schema; - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java index a7f7dabe..b5c065f1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.googlepubsub.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class GooglePubSubOperationBinding extends OperationBinding { +public class GooglePubSubOperationBinding extends com.asyncapi.bindings.googlepubsub.GooglePubSubOperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java index 6919a62a..8332c14a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.googlepubsub.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class GooglePubSubServerBinding extends ServerBinding { +public class GooglePubSubServerBinding extends com.asyncapi.bindings.googlepubsub.GooglePubSubServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java new file mode 100644 index 00000000..5857fe72 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java @@ -0,0 +1,73 @@ +package com.asyncapi.bindings.googlepubsub.v0._2_0.channel; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Map; + +/** + * Describes Google Cloud Pub/Sub channel binding. + *

+ * The Channel Bindings Object is used to describe the Google Cloud Pub/Sub specific Topic details with AsyncAPI. + * + * @version 0.2.0 + * @see Google Cloud Pub/Sub channel binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes Google Cloud Pub/Sub channel binding.") +public class GooglePubSubChannelBinding extends com.asyncapi.bindings.googlepubsub.GooglePubSubChannelBinding { + + /** + * An object of key-value pairs (These are used to categorize Cloud Resources like Cloud Pub/Sub Topics.) + */ + @Nullable + @JsonProperty("labels") + @JsonPropertyDescription("An object of key-value pairs (These are used to categorize Cloud Resources like Cloud Pub/Sub Topics.)") + private Map labels; + + /** + * Indicates the minimum duration to retain a message after it is published to the topic (Must be a valid Duration.) + */ + @Nullable + @JsonProperty("messageRetentionDuration") + @JsonPropertyDescription("Indicates the minimum duration to retain a message after it is published to the topic (Must be a valid https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Duration.)") + private String messageRetentionDuration; + + /** + * Policy constraining the set of Google Cloud Platform regions where messages published to the topic may be stored + */ + @Nullable + @JsonProperty("messageStoragePolicy") + @JsonPropertyDescription("Policy constraining the set of Google Cloud Platform regions where messages published to the topic may be stored") + private GooglePubSubChannelMessageStoragePolicy messageStoragePolicy; + + /** + * Settings for validating messages published against a schema + */ + @NotNull + @Builder.Default + @javax.validation.constraints.NotNull + @JsonProperty(value = "schemaSettings", required = true) + @JsonPropertyDescription("Settings for validating messages published against a schema") + private GooglePubSubChannelSchemaSettings schemaSettings = new GooglePubSubChannelSchemaSettings(); + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java new file mode 100644 index 00000000..e5da58d9 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java @@ -0,0 +1,36 @@ +package com.asyncapi.bindings.googlepubsub.v0._2_0.channel; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * Describes Google Cloud Pub/Sub MessageStoragePolicy. + *

+ * The Message Storage Policy Object is used to describe the Google Cloud Pub/Sub MessageStoragePolicy Object with AsyncAPI. + * + * @version 0.2.0 + * @see Google Cloud Pub/Sub channel binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +@JsonClassDescription("Describe the Google Cloud Pub/Sub MessageStoragePolicy") +public class GooglePubSubChannelMessageStoragePolicy { + + /** + * A list of IDs of GCP regions where messages that are published to the topic may be persisted in storage + */ + @Nullable + @JsonProperty("allowedPersistenceRegions") + @JsonPropertyDescription("A list of IDs of GCP regions where messages that are published to the topic may be persisted in storage") + private List allowedPersistenceRegions; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java new file mode 100644 index 00000000..65e18bf7 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java @@ -0,0 +1,59 @@ +package com.asyncapi.bindings.googlepubsub.v0._2_0.channel; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Google Cloud Pub/Sub SchemaSettings. + *

+ * The Schema Settings Object is used to describe the Google Cloud Pub/Sub SchemaSettings Object with AsyncAPI. + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +@JsonClassDescription("Describe the Google Cloud Pub/Sub SchemaSettings") +public class GooglePubSubChannelSchemaSettings { + + /** + * The encoding of the message (Must be one of the possible Encoding values.) + */ + @NotNull + @Builder.Default + @javax.validation.constraints.NotNull + @JsonProperty(value = "encoding", required = true) + @JsonPropertyDescription("The encoding of the message (Must be one of the possible https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics#encoding values.)") + private String encoding = ""; + + /** + * The minimum (inclusive) revision allowed for validating messages + */ + @Nullable + @JsonProperty("firstRevisionId") + @JsonPropertyDescription("The minimum (inclusive) revision allowed for validating messages") + private String firstRevisionId; + + /** + * The maximum (inclusive) revision allowed for validating messages + */ + @Nullable + @JsonProperty("lastRevisionId") + @JsonPropertyDescription("The maximum (inclusive) revision allowed for validating messages") + private String lastRevisionId; + + /** + * The name of the schema that messages published should be validated against (The format is projects/{project}/schemas/{schema}.) + */ + @NotNull + @Builder.Default + @javax.validation.constraints.NotNull + @JsonProperty(value = "name", required = true) + @JsonPropertyDescription("The name of the schema that messages published should be validated against (The format is projects/{project}/schemas/{schema}.)") + private String name = ""; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java new file mode 100644 index 00000000..929e726d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java @@ -0,0 +1,62 @@ +package com.asyncapi.bindings.googlepubsub.v0._2_0.message; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Google Cloud Pub/Sub message binding. + *

+ * The Message Binding Object is used to describe the Google Cloud Pub/Sub specific PubsubMessage details, alongside with + * pertintent parts of the Google Cloud Pub/Sub Schema Object, with AsyncAPI. + * + * @version 0.2.0 + * @see Google Cloud Pub/Sub message binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes Google Cloud Pub/Sub message binding.") +public class GooglePubSubMessageBinding extends com.asyncapi.bindings.googlepubsub.GooglePubSubMessageBinding { + + /** + * If non-empty, identifies related messages for which publish order should be respected (For more information, see ordering messages.) + */ + @Nullable + @JsonProperty("orderingKey") + @JsonPropertyDescription("If non-empty, identifies related messages for which publish order should be respected (For more information, see https://cloud.google.com/pubsub/docs/ordering messages") + private String orderingKey; + + /** + * Attributes for this message (If this field is empty, the message must contain non-empty data. This can be used to + * filter messages on the subscription.) + */ + @Nullable + @JsonProperty("attributes") + @JsonPropertyDescription("Attributes for this message (If this field is empty, the message must contain non-empty data. This can be used to filter messages on the subscription.)") + private Object attributes; + + /** + * Describes the schema used to validate the payload of this message + */ + @Nullable + @JsonProperty("schema") + @JsonPropertyDescription("Describes the schema used to validate the payload of this message") + private GooglePubSubMessageSchemaDefinition schema; + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java new file mode 100644 index 00000000..3e7b8dd0 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java @@ -0,0 +1,39 @@ +package com.asyncapi.bindings.googlepubsub.v0._2_0.message; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.NotNull; + +/** + * Describes Google Cloud Pub/Sub message schema definition. + *

+ * The Schema Definition Object is used to describe the Google Cloud Pub/Sub Schema Object with AsyncAPI. + * While some of this information could be, or is, described using native AsyncAPI, for consistency it makes sense to + * provide this information here at all times, especially for cases where AsyncAPI does not natively support describing + * payloads using a supported Google Cloud Pub/Sub schema format like Protobuf. + * + * @version 0.2.0 + * @see Google Cloud Pub/Sub message binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +@JsonClassDescription("Describes Google Cloud Pub/Sub message schema definition.") +public class GooglePubSubMessageSchemaDefinition { + + /** + * The name of the schema + */ + @NotNull + @Builder.Default + @javax.validation.constraints.NotNull + @JsonProperty(value = "name", required = true) + @JsonPropertyDescription("The name of the schema") + private String name = ""; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/operation/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/operation/GooglePubSubOperationBinding.java new file mode 100644 index 00000000..81262af4 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/operation/GooglePubSubOperationBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.googlepubsub.v0._2_0.operation; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Google Cloud Pub/Sub operation binding. + * + * @version 0.2.0 + * @see Google Cloud Pub/Sub operation binding + * @author Pavel Bodiachevskii + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class GooglePubSubOperationBinding extends com.asyncapi.bindings.googlepubsub.GooglePubSubOperationBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/server/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/server/GooglePubSubServerBinding.java new file mode 100644 index 00000000..9860fa1a --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/server/GooglePubSubServerBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.googlepubsub.v0._2_0.server; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Google Cloud Pub/Sub server binding. + * + * @version 0.2.0 + * @see Google Cloud Pub/Sub server binding + * @author Pavel Bodiachevskii + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class GooglePubSubServerBinding extends com.asyncapi.bindings.googlepubsub.GooglePubSubServerBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSub.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSub.java new file mode 100644 index 00000000..77e5b3bd --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSub.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.googlepubsub; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("Google Cloud Pub/Sub") +@SelectPackages("com.asyncapi.bindings.googlepubsub") +public class GooglePubSub { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubLatestTest.java new file mode 100644 index 00000000..98f7c937 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.googlepubsub; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.googlepubsub.v0._2_0.channel.GooglePubSubChannelBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.message.GooglePubSubMessageBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.operation.GooglePubSubOperationBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.server.GooglePubSubServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class GooglePubSubLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.channelBinding(); + super.bindingTypeClass = GooglePubSubChannelBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.messageBinding(); + super.bindingTypeClass = GooglePubSubMessageBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.operationBinding(); + super.bindingTypeClass = GooglePubSubOperationBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.serverBinding(); + super.bindingTypeClass = GooglePubSubServerBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubUnknownVersionTest.java new file mode 100644 index 00000000..cec52bee --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.googlepubsub; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.googlepubsub.v0._2_0.channel.GooglePubSubChannelBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.message.GooglePubSubMessageBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.operation.GooglePubSubOperationBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.server.GooglePubSubServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class GooglePubSubUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.channelBinding(); + super.bindingTypeClass = GooglePubSubChannelBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.messageBinding(); + super.bindingTypeClass = GooglePubSubMessageBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.operationBinding(); + super.bindingTypeClass = GooglePubSubOperationBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.serverBinding(); + super.bindingTypeClass = GooglePubSubServerBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubV0_1_0Test.java new file mode 100644 index 00000000..97bb9627 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubV0_1_0Test.java @@ -0,0 +1,104 @@ +package com.asyncapi.bindings.googlepubsub; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelMessageStoragePolicy; +import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelSchemaSettings; +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinition; +import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageSchemaDefinitionType; +import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding; +import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.1.0") +public class GooglePubSubV0_1_0Test { + + public static GooglePubSubChannelBinding channelBinding () { + return GooglePubSubChannelBinding.builder() + .topic("projects/your-project/topics/topic-proto-schema") + .messageRetentionDuration("86400s") + .messageStoragePolicy(new GooglePubSubChannelMessageStoragePolicy( + List.of( + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ) + )) + .schemaSettings(GooglePubSubChannelSchemaSettings.builder() + .encoding("binary") + .name("projects/your-project/schemas/message-proto") + .build() + ) + .build(); + } + + public static GooglePubSubMessageBinding messageBinding () { + return GooglePubSubMessageBinding.builder() + .schema(new GooglePubSubMessageSchemaDefinition( + "projects/your-project/schemas/message-avro", + GooglePubSubMessageSchemaDefinitionType.AVRO + )) + .build(); + } + + public static GooglePubSubOperationBinding operationBinding () { + return new GooglePubSubOperationBinding(); + } + + public static GooglePubSubServerBinding serverBinding () { + return new GooglePubSubServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = GooglePubSubChannelBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = GooglePubSubMessageBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = GooglePubSubOperationBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = GooglePubSubServerBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubV0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubV0_2_0Test.java new file mode 100644 index 00000000..dd592e40 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubV0_2_0Test.java @@ -0,0 +1,101 @@ +package com.asyncapi.bindings.googlepubsub; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.googlepubsub.v0._2_0.channel.GooglePubSubChannelBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.channel.GooglePubSubChannelMessageStoragePolicy; +import com.asyncapi.bindings.googlepubsub.v0._2_0.channel.GooglePubSubChannelSchemaSettings; +import com.asyncapi.bindings.googlepubsub.v0._2_0.message.GooglePubSubMessageBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.message.GooglePubSubMessageSchemaDefinition; +import com.asyncapi.bindings.googlepubsub.v0._2_0.operation.GooglePubSubOperationBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.server.GooglePubSubServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.2.0") +public class GooglePubSubV0_2_0Test { + + public static GooglePubSubChannelBinding channelBinding () { + return GooglePubSubChannelBinding.builder() + .messageRetentionDuration("86400s") + .messageStoragePolicy(new GooglePubSubChannelMessageStoragePolicy( + List.of( + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ) + )) + .schemaSettings(GooglePubSubChannelSchemaSettings.builder() + .encoding("binary") + .name("projects/your-project/schemas/message-proto") + .build() + ) + .build(); + } + + public static GooglePubSubMessageBinding messageBinding () { + return GooglePubSubMessageBinding.builder() + .schema(new GooglePubSubMessageSchemaDefinition( + "projects/your-project/schemas/message-avro" + )) + .build(); + } + + public static GooglePubSubOperationBinding operationBinding () { + return new GooglePubSubOperationBinding(); + } + + public static GooglePubSubServerBinding serverBinding () { + return new GooglePubSubServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = GooglePubSubChannelBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/0.2.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/0.2.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/0.2.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = GooglePubSubMessageBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/0.2.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/0.2.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/0.2.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = GooglePubSubOperationBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/0.2.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/0.2.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/0.2.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = GooglePubSubServerBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/0.2.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/0.2.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/0.2.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubWithoutVersionTest.java new file mode 100644 index 00000000..72c378f8 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/GooglePubSubWithoutVersionTest.java @@ -0,0 +1,59 @@ +package com.asyncapi.bindings.googlepubsub; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test; +import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; +import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.channel.GooglePubSubChannelBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.message.GooglePubSubMessageBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.operation.GooglePubSubOperationBinding; +import com.asyncapi.bindings.googlepubsub.v0._2_0.server.GooglePubSubServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class GooglePubSubWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.channelBinding(); + super.bindingTypeClass = GooglePubSubChannelBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.messageBinding(); + super.bindingTypeClass = GooglePubSubMessageBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.operationBinding(); + super.bindingTypeClass = GooglePubSubOperationBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = GooglePubSubV0_2_0Test.serverBinding(); + super.bindingTypeClass = GooglePubSubServerBinding.class; + super.pathToBindingJson = "/bindings/googlepubsub/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/googlepubsub/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/googlepubsub/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt deleted file mode 100644 index c956668e..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBindingTest.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.asyncapi.bindings.googlepubsub.v0._1_0.channel - -import com.asyncapi.v3.SerDeTest - -class GooglePubSubChannelBindingTest: SerDeTest() { - - override fun objectClass() = GooglePubSubChannelBinding::class.java - - override fun baseObjectJson() = "/bindings/googlepubsub/channel/googlePubSubChannelBinding.json" - - override fun extendedObjectJson() = "/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/googlepubsub/channel/googlePubSubChannelBinding - wrongly extended.json" - - override fun build(): GooglePubSubChannelBinding { - return GooglePubSubChannelBinding.builder() - .topic("projects/your-project/topics/topic-proto-schema") - .messageRetentionDuration("86400s") - .messageStoragePolicy(GooglePubSubChannelMessageStoragePolicy( - listOf( - "us-central1", - "us-central2", - "us-east1", - "us-east4", - "us-east5", - "us-east7", - "us-south1", - "us-west1", - "us-west2", - "us-west3", - "us-west4" - ) - )) - .schemaSettings(GooglePubSubChannelSchemaSettings.builder() - .encoding("binary") - .name("projects/your-project/schemas/message-proto") - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt deleted file mode 100644 index a7063cf1..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBindingTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.asyncapi.bindings.googlepubsub.v0._1_0.message - -import com.asyncapi.v3.SerDeTest - -class GooglePubSubMessageBindingTest: SerDeTest() { - - override fun objectClass() = GooglePubSubMessageBinding::class.java - - override fun baseObjectJson() = "/bindings/googlepubsub/message/googlePubSubMessageBinding.json" - - override fun extendedObjectJson() = "/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/googlepubsub/message/googlePubSubMessageBinding - wrongly extended.json" - - override fun build(): GooglePubSubMessageBinding { - return GooglePubSubMessageBinding.builder() - .schema(GooglePubSubMessageSchemaDefinition( - "projects/your-project/schemas/message-avro", - GooglePubSubMessageSchemaDefinitionType.AVRO - )) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index c7798aa1..e0c002fa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.bindings.ChannelBinding import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding @@ -58,7 +58,7 @@ class ChannelItemTest: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", AMQP1ChannelBinding()), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), - Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", HTTPChannelBinding()), Pair("ibmmq", IBMMQChannelBindingTest().build()), Pair("jms", JMSChannelBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 5174c8ef..b0e88b67 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.MessageBinding import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding @@ -117,7 +117,7 @@ class MessageTest: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", AMQP1MessageBinding()), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", JMSMessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 77279d9d..f30c4598 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding @@ -76,7 +76,7 @@ class MessageTraitTest: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", AMQP1MessageBinding()), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", JMSMessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 5ae29c36..40218a71 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.OperationBinding import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding -import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding @@ -104,7 +104,7 @@ class OperationTest { Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", AMQP1OperationBinding()), Pair("anypointmq", AnypointMQOperationBinding()), - Pair("googlepubsub", GooglePubSubOperationBinding()), + Pair("googlepubsub", GooglePubSubV0_2_0Test.operationBinding()), Pair("http", HTTPOperationBindingTest().build()), Pair("ibmmq", IBMMQOperationBinding()), Pair("jms", JMSOperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 05a06df0..9c9fad4e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding -import com.asyncapi.bindings.googlepubsub.v0._1_0.operation.GooglePubSubOperationBinding +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding @@ -53,7 +53,7 @@ class OperationTraitTest: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.operationBinding()), Pair("amqp1", AMQP1OperationBinding()), Pair("anypointmq", AnypointMQOperationBinding()), - Pair("googlepubsub", GooglePubSubOperationBinding()), + Pair("googlepubsub", GooglePubSubV0_2_0Test.operationBinding()), Pair("http", HTTPOperationBindingTest().build()), Pair("ibmmq", IBMMQOperationBinding()), Pair("jms", JMSOperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 582d4cb2..aaddfdc2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.bindings.ServerBinding import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding -import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding @@ -64,7 +64,7 @@ class ServerTest: SerDeTest() { return mapOf( Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), - Pair("googlepubsub", GooglePubSubServerBinding()), + Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), Pair("http", HTTPServerBinding()), Pair( "ibmmq", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 2c6d2ffd..93b3cbf8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTes import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest @@ -47,7 +47,7 @@ class ChannelItemTest: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", Reference("#/components/channelBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), - Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQChannelBindingTest().build()), Pair("jms", Reference("#/components/channelBindings/jms")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index ef15c8f1..4daf1f2d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest @@ -91,7 +91,7 @@ class MessageTest: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 8d6576bd..9bfc1f89 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest @@ -63,7 +63,7 @@ class MessageTraitTest: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index c4724f26..de9125c0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding -import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding @@ -71,7 +71,7 @@ class ServerTest: SerDeTest() { Pair("amqp", Reference("#/components/serverBindings/amqp")), Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), - Pair("googlepubsub", GooglePubSubServerBinding()), + Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), Pair("http", HTTPServerBinding()), Pair( "ibmmq", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 836a9e2a..c7967c75 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithReference import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithSchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test -import com.asyncapi.bindings.googlepubsub.v0._1_0.channel.GooglePubSubChannelBindingTest +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest @@ -67,7 +67,7 @@ class ChannelTest: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", Reference("#/components/channelBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), - Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQChannelBindingTest().build()), Pair("jms", Reference("#/components/channelBindings/jms")), @@ -140,7 +140,7 @@ class ChannelTestWithReference: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.channelBinding()), Pair("amqp1", Reference("#/components/channelBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), - Pair("googlepubsub", GooglePubSubChannelBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQChannelBindingTest().build()), Pair("jms", Reference("#/components/channelBindings/jms")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 7c1bf465..12b3e6ef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest @@ -87,7 +87,7 @@ class MessageTestWithSchema: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), @@ -140,7 +140,7 @@ class MessageTestWithReference: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), @@ -230,7 +230,7 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 83c572b7..21237651 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test -import com.asyncapi.bindings.googlepubsub.v0._1_0.message.GooglePubSubMessageBindingTest +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest @@ -62,7 +62,7 @@ class MessageTraitTestWithSchema: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), @@ -117,7 +117,7 @@ class MessageTraitTestWithReference: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), @@ -189,7 +189,7 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { Pair("amqp", AMQPV0_2_0Test.messageBinding()), Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), - Pair("googlepubsub", GooglePubSubMessageBindingTest().build()), + Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPMessageBindingTest().build()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index ab4db1b2..769d2979 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding -import com.asyncapi.bindings.googlepubsub.v0._1_0.server.GooglePubSubServerBinding +import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding @@ -81,7 +81,7 @@ class ServerTest: SerDeTest() { Pair("amqp", Reference("#/components/serverBindings/amqp")), Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), - Pair("googlepubsub", GooglePubSubServerBinding()), + Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), Pair("http", HTTPServerBinding()), Pair( "ibmmq", @@ -198,7 +198,7 @@ class ServerTestWithReference: SerDeTest() { Pair("amqp", Reference("#/components/serverBindings/amqp")), Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), - Pair("googlepubsub", GooglePubSubServerBinding()), + Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), Pair("http", HTTPServerBinding()), Pair( "ibmmq", diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/googlepubsub/channel/googlePubSubChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/googlepubsub/message/googlePubSubMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.1.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding - extended.json new file mode 100644 index 00000000..f6261e2e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.2.0", + "messageRetentionDuration" : "86400s", + "messageStoragePolicy" : { + "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] + }, + "schemaSettings" : { + "encoding" : "binary", + "name" : "projects/your-project/schemas/message-proto" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..e9e254e3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding - wrongly extended.json @@ -0,0 +1,29 @@ +{ + "messageRetentionDuration": "86400s", + "messageStoragePolicy": { + "allowedPersistenceRegions": [ + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ] + }, + "schemaSettings": { + "encoding": "binary", + "name": "projects/your-project/schemas/message-proto" + }, + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding.json new file mode 100644 index 00000000..dcbcf571 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/channel/binding.json @@ -0,0 +1,23 @@ +{ + "messageRetentionDuration": "86400s", + "messageStoragePolicy": { + "allowedPersistenceRegions": [ + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ] + }, + "schemaSettings": { + "encoding": "binary", + "name": "projects/your-project/schemas/message-proto" + }, + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding - extended.json new file mode 100644 index 00000000..ec2374fc --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding - extended.json @@ -0,0 +1,11 @@ +{ + "bindingVersion" : "0.2.0", + "schema" : { + "name" : "projects/your-project/schemas/message-avro" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..5b9d6398 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding - wrongly extended.json @@ -0,0 +1,12 @@ +{ + "schema": { + "name": "projects/your-project/schemas/message-avro" + }, + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding.json new file mode 100644 index 00000000..8764c900 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/message/binding.json @@ -0,0 +1,6 @@ +{ + "schema": { + "name": "projects/your-project/schemas/message-avro" + }, + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/0.2.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding - extended.json new file mode 100644 index 00000000..f6261e2e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.2.0", + "messageRetentionDuration" : "86400s", + "messageStoragePolicy" : { + "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] + }, + "schemaSettings" : { + "encoding" : "binary", + "name" : "projects/your-project/schemas/message-proto" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..fe9c5478 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding - wrongly extended.json @@ -0,0 +1,29 @@ +{ + "messageRetentionDuration": "86400s", + "messageStoragePolicy": { + "allowedPersistenceRegions": [ + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ] + }, + "schemaSettings": { + "encoding": "binary", + "name": "projects/your-project/schemas/message-proto" + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding.json new file mode 100644 index 00000000..658baaf3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/channel/binding.json @@ -0,0 +1,23 @@ +{ + "messageRetentionDuration": "86400s", + "messageStoragePolicy": { + "allowedPersistenceRegions": [ + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ] + }, + "schemaSettings": { + "encoding": "binary", + "name": "projects/your-project/schemas/message-proto" + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding - extended.json new file mode 100644 index 00000000..ec2374fc --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding - extended.json @@ -0,0 +1,11 @@ +{ + "bindingVersion" : "0.2.0", + "schema" : { + "name" : "projects/your-project/schemas/message-avro" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..68a8cce0 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding - wrongly extended.json @@ -0,0 +1,12 @@ +{ + "schema": { + "name": "projects/your-project/schemas/message-avro" + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding.json new file mode 100644 index 00000000..019f3cb3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/message/binding.json @@ -0,0 +1,6 @@ +{ + "schema": { + "name": "projects/your-project/schemas/message-avro" + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/latest/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..f6261e2e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.2.0", + "messageRetentionDuration" : "86400s", + "messageStoragePolicy" : { + "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] + }, + "schemaSettings" : { + "encoding" : "binary", + "name" : "projects/your-project/schemas/message-proto" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..e1ec6296 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,29 @@ +{ + "messageRetentionDuration": "86400s", + "messageStoragePolicy": { + "allowedPersistenceRegions": [ + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ] + }, + "schemaSettings": { + "encoding": "binary", + "name": "projects/your-project/schemas/message-proto" + }, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding.json new file mode 100644 index 00000000..631a6e21 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/channel/binding.json @@ -0,0 +1,23 @@ +{ + "messageRetentionDuration": "86400s", + "messageStoragePolicy": { + "allowedPersistenceRegions": [ + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ] + }, + "schemaSettings": { + "encoding": "binary", + "name": "projects/your-project/schemas/message-proto" + }, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding - extended.json new file mode 100644 index 00000000..ec2374fc --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding - extended.json @@ -0,0 +1,11 @@ +{ + "bindingVersion" : "0.2.0", + "schema" : { + "name" : "projects/your-project/schemas/message-avro" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..93d61fd7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,12 @@ +{ + "schema": { + "name": "projects/your-project/schemas/message-avro" + }, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding.json new file mode 100644 index 00000000..749b7ba0 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/message/binding.json @@ -0,0 +1,6 @@ +{ + "schema": { + "name": "projects/your-project/schemas/message-avro" + }, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/unknown version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - extended.json new file mode 100644 index 00000000..f6261e2e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.2.0", + "messageRetentionDuration" : "86400s", + "messageStoragePolicy" : { + "allowedPersistenceRegions" : [ "us-central1", "us-central2", "us-east1", "us-east4", "us-east5", "us-east7", "us-south1", "us-west1", "us-west2", "us-west3", "us-west4" ] + }, + "schemaSettings" : { + "encoding" : "binary", + "name" : "projects/your-project/schemas/message-proto" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..e9e254e3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - wrongly extended.json @@ -0,0 +1,29 @@ +{ + "messageRetentionDuration": "86400s", + "messageStoragePolicy": { + "allowedPersistenceRegions": [ + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ] + }, + "schemaSettings": { + "encoding": "binary", + "name": "projects/your-project/schemas/message-proto" + }, + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding.json new file mode 100644 index 00000000..a92cc1f3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding.json @@ -0,0 +1,23 @@ +{ + "messageRetentionDuration": "86400s", + "messageStoragePolicy": { + "allowedPersistenceRegions": [ + "us-central1", + "us-central2", + "us-east1", + "us-east4", + "us-east5", + "us-east7", + "us-south1", + "us-west1", + "us-west2", + "us-west3", + "us-west4" + ] + }, + "schemaSettings": { + "encoding": "binary", + "name": "projects/your-project/schemas/message-proto" + }, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - extended.json new file mode 100644 index 00000000..ec2374fc --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - extended.json @@ -0,0 +1,11 @@ +{ + "bindingVersion" : "0.2.0", + "schema" : { + "name" : "projects/your-project/schemas/message-avro" + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..11ec3f59 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - wrongly extended.json @@ -0,0 +1,12 @@ +{ + "schema": { + "name": "projects/your-project/schemas/message-avro" + }, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding.json new file mode 100644 index 00000000..45b7bd7f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding.json @@ -0,0 +1,6 @@ +{ + "schema": { + "name": "projects/your-project/schemas/message-avro" + }, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index d91617c3..a6ce675e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -40,8 +40,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -133,8 +137,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -248,8 +256,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -366,8 +378,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -481,8 +497,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -1156,8 +1176,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -1372,8 +1396,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1563,8 +1591,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index d14f6a5d..e10b5662 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -33,8 +33,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -148,8 +152,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -266,8 +274,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -381,8 +393,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 23a1fac3..eaa7a05f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -31,8 +31,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -146,8 +150,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index a1b1e1fb..257ebc9f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -31,8 +31,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -146,8 +150,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 4e139c5e..88e49b98 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -31,8 +31,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 5e761323..32949e56 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -319,8 +319,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", @@ -535,8 +539,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -726,8 +734,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { "bindingVersion" : "0.1.0", "type" : "request", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index ff0ac635..2ac13418 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -20,8 +20,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index a27233e2..3992d899 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -49,8 +49,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1195,8 +1199,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2873,8 +2881,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index a6809401..d493e1b2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -61,8 +61,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1739,8 +1743,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 7a5b4bea..451362a3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -30,8 +30,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 59d63286..50ed2309 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -76,8 +76,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -181,8 +185,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5050,8 +5058,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -12471,8 +12483,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index f954fa97..2af6d0b6 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -78,8 +78,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7499,8 +7503,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 98564ea2..2ea71b10 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -44,8 +44,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index f45509c0..d7066da6 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -47,8 +47,12 @@ "amqp1" : { "bindingVersion" : "0.1.0" }, - "anypointmq" : { }, - "googlepubsub" : { }, + "anypointmq" : { + "bindingVersion" : "0.0.1" + }, + "googlepubsub" : { + "bindingVersion" : "0.2.0" + }, "http" : { }, "ibmmq" : { "bindingVersion" : "0.1.0", From e99fd01bd3e8a731dd3d782b4b46a72743d8c622 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sat, 27 Apr 2024 15:12:20 +0400 Subject: [PATCH 044/141] tests(bindings): HTTP 0.1.0, 0.2.0, 0.3.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/170 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/http/HTTPChannelBinding.java | 30 ++ .../bindings/http/HTTPMessageBinding.java | 30 ++ .../bindings/http/HTTPOperationBinding.java | 30 ++ .../bindings/http/HTTPServerBinding.java | 30 ++ .../v0/_1_0/channel/HTTPChannelBinding.java | 15 +- .../v0/_1_0/message/HTTPMessageBinding.java | 20 +- .../_1_0/operation/HTTPOperationBinding.java | 20 +- .../v0/_1_0/server/HTTPServerBinding.java | 15 +- .../v0/_2_0/channel/HTTPChannelBinding.java | 32 ++ .../v0/_2_0/message/HTTPMessageBinding.java | 44 ++ .../_2_0/operation/HTTPOperationBinding.java | 54 +++ .../_2_0/operation/HTTPOperationMethod.java | 22 + .../v0/_2_0/server/HTTPServerBinding.java | 32 ++ .../v0/_3_0/channel/HTTPChannelBinding.java | 32 ++ .../v0/_3_0/message/HTTPMessageBinding.java | 56 +++ .../_3_0/operation/HTTPOperationBinding.java | 53 +++ .../_3_0/operation/HTTPOperationMethod.java | 22 + .../v0/_3_0/server/HTTPServerBinding.java | 32 ++ .../com/asyncapi/bindings/http/HTTP.java | 11 + .../bindings/http/HTTPLatestTest.java | 54 +++ .../bindings/http/HTTPUnknownVersionTest.java | 54 +++ .../bindings/http/HTTPV0_1_0Test.java | 105 +++++ .../bindings/http/HTTPV0_2_0Test.java | 103 +++++ .../bindings/http/HTTPV0_3_0Test.java | 104 +++++ .../bindings/http/HTTPWithoutVersionTest.java | 54 +++ .../v0/_1_0/message/HTTPMessageBindingTest.kt | 34 -- .../operation/HTTPOperationBindingTest.kt | 41 -- .../examples/v2/_0_0/GitterStreaming.kt | 6 +- .../examples/v2/_0_0/OperationSecurity.kt | 8 +- .../examples/v2/_6_0/GitterStreaming.kt | 6 +- .../examples/v2/_6_0/OperationSecurity.kt | 6 +- .../v3/_0_0/GitterStreamingAsyncAPI.kt | 14 +- .../v3/_0_0/OperationSecurityAsyncAPI.kt | 4 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_0_0/model/server/ServerTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_6_0/model/server/ServerTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 8 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../v3/_0_0/model/operation/OperationTest.kt | 6 +- .../model/operation/OperationTraitTest.kt | 6 +- .../v3/_0_0/model/server/ServerTest.kt | 6 +- .../0.1.0/channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../bindings/http/0.1.0/channel/binding.json | 3 + .../message/binding - extended.json} | 0 .../message/binding - wrongly extended.json} | 0 .../message/binding.json} | 0 .../operation/binding - extended.json} | 0 .../binding - wrongly extended.json} | 0 .../operation/binding.json} | 0 .../http/0.1.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../bindings/http/0.1.0/server/binding.json | 3 + .../0.2.0/channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../bindings/http/0.2.0/channel/binding.json | 3 + .../0.2.0/message/binding - extended.json | 17 + .../message/binding - wrongly extended.json | 20 + .../bindings/http/0.2.0/message/binding.json | 14 + .../0.2.0/operation/binding - extended.json | 21 + .../operation/binding - wrongly extended.json | 24 ++ .../http/0.2.0/operation/binding.json | 18 + .../http/0.2.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../bindings/http/0.2.0/server/binding.json | 3 + .../0.3.0/channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../bindings/http/0.3.0/channel/binding.json | 3 + .../0.3.0/message/binding - extended.json | 18 + .../message/binding - wrongly extended.json | 21 + .../bindings/http/0.3.0/message/binding.json | 15 + .../0.3.0/operation/binding - extended.json | 21 + .../operation/binding - wrongly extended.json | 24 ++ .../http/0.3.0/operation/binding.json | 18 + .../http/0.3.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../bindings/http/0.3.0/server/binding.json | 3 + .../latest/channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../bindings/http/latest/channel/binding.json | 3 + .../latest/message/binding - extended.json | 18 + .../message/binding - wrongly extended.json | 21 + .../bindings/http/latest/message/binding.json | 15 + .../latest/operation/binding - extended.json | 21 + .../operation/binding - wrongly extended.json | 24 ++ .../http/latest/operation/binding.json | 18 + .../latest/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../bindings/http/latest/server/binding.json | 3 + .../channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../http/unknown version/channel/binding.json | 3 + .../message/binding - extended.json | 18 + .../message/binding - wrongly extended.json | 21 + .../http/unknown version/message/binding.json | 15 + .../operation/binding - extended.json | 21 + .../operation/binding - wrongly extended.json | 24 ++ .../unknown version/operation/binding.json | 18 + .../server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../http/unknown version/server/binding.json | 3 + .../channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../http/without version/channel/binding.json | 3 + .../message/binding - extended.json | 18 + .../message/binding - wrongly extended.json | 21 + .../http/without version/message/binding.json | 15 + .../operation/binding - extended.json | 21 + .../operation/binding - wrongly extended.json | 24 ++ .../without version/operation/binding.json | 18 + .../server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../http/without version/server/binding.json | 3 + .../examples/v2.0.0/gitter-streaming.yml | 3 +- .../examples/v2.0.0/operation-security.yml | 1 - .../examples/v2.6.0/gitter-streaming.yml | 3 +- .../examples/v2.6.0/operation-security.yml | 1 - .../v3.0.0/gitter-streaming-asyncapi.yml | 4 +- .../v2/2.0.0/model/asyncapi - extended.json | 54 +-- .../json/v2/2.0.0/model/asyncapi.json | 30 +- .../model/channel/channelItem - extended.json | 21 +- .../channelItem - wrongly extended.json | 15 +- .../v2/2.0.0/model/channel/channelItem.json | 15 +- .../channel/message/message - extended.json | 5 +- .../message/message - wrongly extended.json | 3 +- .../2.0.0/model/channel/message/message.json | 3 +- .../message/messageTrait - extended.json | 5 +- .../messageTrait - wrongly extended.json | 3 +- .../model/channel/message/messageTrait.json | 3 +- .../operation with message - extended.json | 11 +- ...ation with message - wrongly extended.json | 9 +- .../operation/operation with message.json | 9 +- ... with reference to message - extended.json | 6 +- ...ference to message - wrongly extended.json | 6 +- .../operation with reference to message.json | 6 +- .../operation/operationTrait - extended.json | 3 +- .../operationTrait - wrongly extended.json | 3 +- .../channel/operation/operationTrait.json | 3 +- .../components/components - extended.json | 29 +- .../components - wrongly extended.json | 15 +- .../v2/2.0.0/model/components/components.json | 15 +- .../2.0.0/model/server/server - extended.json | 4 +- .../v2/2.6.0/model/asyncapi - extended.json | 77 ++-- .../json/v2/2.6.0/model/asyncapi.json | 51 ++- .../model/channel/channelItem - extended.json | 22 +- .../channelItem - wrongly extended.json | 18 +- .../v2/2.6.0/model/channel/channelItem.json | 18 +- .../channel/message/message - extended.json | 5 +- .../message/message - wrongly extended.json | 3 +- .../2.6.0/model/channel/message/message.json | 3 +- .../message/messageTrait - extended.json | 5 +- .../messageTrait - wrongly extended.json | 3 +- .../model/channel/message/messageTrait.json | 3 +- .../model/channel/message/oneOfMessages.json | 3 +- .../operation with message - extended.json | 11 +- .../operation/operation with message.json | 9 +- ...eration with oneOf message - extended.json | 11 +- ...with oneOf message - wrongly extended.json | 9 +- .../operation with oneOf message.json | 9 +- ... with reference to message - extended.json | 6 +- ...ference to message - wrongly extended.json | 6 +- .../operation with reference to message.json | 6 +- .../operation/operationTrait - extended.json | 3 +- .../operationTrait - wrongly extended.json | 3 +- .../channel/operation/operationTrait.json | 3 +- .../components/components - extended.json | 51 +-- .../v2/2.6.0/model/components/components.json | 33 +- .../2.6.0/model/server/server - extended.json | 4 +- .../v3/3.0.0/model/asyncapi - extended.json | 381 ++++++++++-------- .../json/v3/3.0.0/model/asyncapi.json | 237 ++++++----- .../model/channel/channel - extended.json | 60 +-- .../channel with reference - extended.json | 60 +-- ...nel with reference - wrongly extended.json | 36 +- .../model/channel/channel with reference.json | 36 +- .../json/v3/3.0.0/model/channel/channel.json | 36 +- .../channel/message/message - extended.json | 20 +- .../message/message - wrongly extended.json | 12 +- .../channel/message/message 2 - extended.json | 20 +- .../message/message 2 - wrongly extended.json | 12 +- .../model/channel/message/message 2.json | 12 +- .../message with reference - extended.json | 20 +- ...age with reference - wrongly extended.json | 12 +- .../message/message with reference.json | 12 +- .../3.0.0/model/channel/message/message.json | 12 +- .../message/messageTrait - extended.json | 5 +- .../messageTrait - wrongly extended.json | 3 +- .../message/messageTrait 2 - extended.json | 5 +- .../messageTrait 2 - wrongly extended.json | 3 +- .../model/channel/message/messageTrait 2.json | 3 +- ...essageTrait with reference - extended.json | 5 +- ...ait with reference - wrongly extended.json | 3 +- .../message/messageTrait with reference.json | 3 +- .../model/channel/message/messageTrait.json | 3 +- .../components/components - extended.json | 235 ++++++----- .../v3/3.0.0/model/components/components.json | 147 ++++--- .../model/operation/operation - extended.json | 9 +- .../operation - wrongly extended.json | 9 +- .../operation with reference - extended.json | 9 +- ...ion with reference - wrongly extended.json | 9 +- .../operation/operation with reference.json | 9 +- .../v3/3.0.0/model/operation/operation.json | 9 +- .../operation/operationTrait - extended.json | 3 +- .../operationTrait - wrongly extended.json | 3 +- ...rationTrait with reference - extended.json | 3 +- ...ait with reference - wrongly extended.json | 3 +- .../operationTrait with reference.json | 3 +- .../3.0.0/model/operation/operationTrait.json | 3 +- .../3.0.0/model/server/server - extended.json | 4 +- .../server with reference - extended.json | 4 +- 221 files changed, 3106 insertions(+), 1111 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/channel/HTTPChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationMethod.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/server/HTTPServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/channel/HTTPChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationMethod.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/server/HTTPServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTP.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding.json rename asyncapi-core/src/test/resources/bindings/http/{message/httpMessageBinding - extended.json => 0.1.0/message/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/http/{message/httpMessageBinding - wrongly extended.json => 0.1.0/message/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/http/{message/httpMessageBinding.json => 0.1.0/message/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/http/{operation/httpOperationBinding - extended.json => 0.1.0/operation/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/http/{operation/httpOperationBinding - wrongly extended.json => 0.1.0/operation/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/http/{operation/httpOperationBinding.json => 0.1.0/operation/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/http/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 470fb155..8066517e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -4,7 +4,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; import com.asyncapi.bindings.anypointmq.AnypointMQChannelBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubChannelBinding; -import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding; +import com.asyncapi.bindings.http.HTTPChannelBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 55adb396..7c61eab9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -4,7 +4,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; import com.asyncapi.bindings.anypointmq.AnypointMQMessageBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubMessageBinding; -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding; +import com.asyncapi.bindings.http.HTTPMessageBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index b45821b0..0f10a5b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -4,7 +4,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; import com.asyncapi.bindings.anypointmq.AnypointMQOperationBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubOperationBinding; -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding; +import com.asyncapi.bindings.http.HTTPOperationBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 230d94a0..24d516d8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -4,7 +4,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; import com.asyncapi.bindings.anypointmq.AnypointMQServerBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubServerBinding; -import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; +import com.asyncapi.bindings.http.HTTPServerBinding; import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPChannelBinding.java new file mode 100644 index 00000000..569c12fb --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPChannelBinding.java @@ -0,0 +1,30 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes HTTP channel binding. + * + * @see HTTP channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.http.v0._3_0.channel.HTTPChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._2_0.channel.HTTPChannelBinding.class, names = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._3_0.channel.HTTPChannelBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class HTTPChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPMessageBinding.java new file mode 100644 index 00000000..c6a871d8 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPMessageBinding.java @@ -0,0 +1,30 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Contains information about the message representation in HTTP. + * + * @see HTTP message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._2_0.message.HTTPMessageBinding.class, names = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class HTTPMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPOperationBinding.java new file mode 100644 index 00000000..80731d57 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPOperationBinding.java @@ -0,0 +1,30 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Contains information about the operation representation in HTTP. + * + * @see HTTP operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._2_0.operation.HTTPOperationBinding.class, names = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class HTTPOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPServerBinding.java new file mode 100644 index 00000000..f880c936 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPServerBinding.java @@ -0,0 +1,30 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes HTTP server binding. + * + * @see HTTP server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.http.v0._3_0.server.HTTPServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._2_0.server.HTTPServerBinding.class, names = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.http.v0._3_0.server.HTTPServerBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class HTTPServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java index f06a46a6..374ac399 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.http.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class HTTPChannelBinding extends ChannelBinding { +public class HTTPChannelBinding extends com.asyncapi.bindings.http.HTTPChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java index ab718288..2c70c786 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.http.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -21,7 +20,7 @@ @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class HTTPMessageBinding extends MessageBinding { +public class HTTPMessageBinding extends com.asyncapi.bindings.http.HTTPMessageBinding { /** * A Schema object containing the definitions for each query parameter. This schema MUST be of type object @@ -32,13 +31,14 @@ public class HTTPMessageBinding extends MessageBinding { @JsonPropertyDescription("A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.") private AsyncAPISchema headers; - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java index ac866c5f..b8357de5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.http.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -22,7 +21,7 @@ @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class HTTPOperationBinding extends OperationBinding { +public class HTTPOperationBinding extends com.asyncapi.bindings.http.HTTPOperationBinding { /** * Required. @@ -54,13 +53,14 @@ public class HTTPOperationBinding extends OperationBinding { @JsonPropertyDescription("A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.") private AsyncAPISchema query; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java index 269924f4..cef30738 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.http.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class HTTPServerBinding extends ServerBinding { +public class HTTPServerBinding extends com.asyncapi.bindings.http.HTTPServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/channel/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/channel/HTTPChannelBinding.java new file mode 100644 index 00000000..e8edc01d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/channel/HTTPChannelBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.http.v0._2_0.channel; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes HTTP channel binding. + * + * @version 0.2.0 + * @see HTTP channel binding + * @author Pavel Bodiachevskii + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HTTPChannelBinding extends com.asyncapi.bindings.http.HTTPChannelBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java new file mode 100644 index 00000000..3b104932 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java @@ -0,0 +1,44 @@ +package com.asyncapi.bindings.http.v0._2_0.message; + +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes HTTP message binding. + *

+ * Contains information about the message representation in HTTP. + * + * @version 0.2.0 + * @see HTTP message binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HTTPMessageBinding extends com.asyncapi.bindings.http.HTTPMessageBinding { + + /** + * A Schema object containing the definitions for each query parameter. This schema MUST be of type object + * and have a properties key.* + */ + @Nullable + @JsonProperty("headers") + @JsonPropertyDescription("A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.") + private AsyncAPISchema headers; + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java new file mode 100644 index 00000000..2ed6ff70 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.http.v0._2_0.operation; + +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Describes HTTP operation binding. + *

+ * Contains information about the operation representation in HTTP. + * + * @version 0.2.0 + * @see HTTP operation binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HTTPOperationBinding extends com.asyncapi.bindings.http.HTTPOperationBinding { + + /** + * When type is request, this is the HTTP method, otherwise it MUST be ignored. Its value MUST be one of + * GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS, CONNECT, and TRACE. + */ + @Nullable + @JsonProperty("method") + @JsonPropertyDescription("When type is request, this is the HTTP method, otherwise it MUST be ignored. Its value MUST be one of GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS, CONNECT, and TRACE.") + private HTTPOperationMethod method; + + /** + * A Schema object containing the definitions for each query parameter. This schema MUST be of type object + * and have a properties key. + */ + @Nullable + @JsonProperty("query") + @JsonPropertyDescription("A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.") + private AsyncAPISchema query; + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationMethod.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationMethod.java new file mode 100644 index 00000000..067ea0d0 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationMethod.java @@ -0,0 +1,22 @@ +package com.asyncapi.bindings.http.v0._2_0.operation; + +/** + * Describes HTTP operation type. + *

+ * Contains information about the operation type. + * + * @version 0.1.0 + * @see HTTP operation binding + * @author Pavel Bodiachevskii + */ +public enum HTTPOperationMethod { + GET, + PUT, + POST, + PATCH, + DELETE, + HEAD, + OPTIONS, + CONNECT, + TRACE +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/server/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/server/HTTPServerBinding.java new file mode 100644 index 00000000..aa0fde30 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/server/HTTPServerBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.http.v0._2_0.server; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes HTTP server binding. + * + * @version 0.2.0 + * @see HTTP server binding + * @author Pavel Bodiachevskii + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HTTPServerBinding extends com.asyncapi.bindings.http.HTTPServerBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/channel/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/channel/HTTPChannelBinding.java new file mode 100644 index 00000000..afb3cca2 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/channel/HTTPChannelBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.http.v0._3_0.channel; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes HTTP channel binding. + * + * @version 0.3.0 + * @see HTTP channel binding + * @author Pavel Bodiachevskii + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HTTPChannelBinding extends com.asyncapi.bindings.http.HTTPChannelBinding { + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java new file mode 100644 index 00000000..1ec45d80 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java @@ -0,0 +1,56 @@ +package com.asyncapi.bindings.http.v0._3_0.message; + +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes HTTP message binding. + *

+ * Contains information about the message representation in HTTP. + * + * @version 0.3.0 + * @see HTTP message binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HTTPMessageBinding extends com.asyncapi.bindings.http.HTTPMessageBinding { + + /** + * A Schema object containing the definitions for each query parameter. This schema MUST be of type object + * and have a properties key.* + */ + @Nullable + @JsonProperty("headers") + @JsonPropertyDescription("A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.") + private AsyncAPISchema headers; + + /** + * The HTTP response status code according to RFC 9110. + *

+ * `statusCode` is only relevant for messages referenced by the Operation Reply Object, + * as it defines the status code for the response. + *

+ * In all other cases, this value can be safely ignored. + */ + @Nullable + @JsonProperty("statusCode") + private Integer statusCode; + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java new file mode 100644 index 00000000..834a4d51 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java @@ -0,0 +1,53 @@ +package com.asyncapi.bindings.http.v0._3_0.operation; + +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes HTTP operation binding. + *

+ * Contains information about the operation representation in HTTP. + * + * @version 0.3.0 + * @see HTTP operation binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HTTPOperationBinding extends com.asyncapi.bindings.http.HTTPOperationBinding { + + /** + * When type is request, this is the HTTP method, otherwise it MUST be ignored. Its value MUST be one of + * GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS, CONNECT, and TRACE. + */ + @Nullable + @JsonProperty("method") + @JsonPropertyDescription("When type is request, this is the HTTP method, otherwise it MUST be ignored. Its value MUST be one of GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS, CONNECT, and TRACE.") + private HTTPOperationMethod method; + + /** + * A Schema object containing the definitions for each query parameter. This schema MUST be of type object + * and have a properties key. + */ + @Nullable + @JsonProperty("query") + @JsonPropertyDescription("A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.") + private AsyncAPISchema query; + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationMethod.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationMethod.java new file mode 100644 index 00000000..37fa1066 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationMethod.java @@ -0,0 +1,22 @@ +package com.asyncapi.bindings.http.v0._3_0.operation; + +/** + * Describes HTTP operation type. + *

+ * Contains information about the operation type. + * + * @version 0.1.0 + * @see HTTP operation binding + * @author Pavel Bodiachevskii + */ +public enum HTTPOperationMethod { + GET, + PUT, + POST, + PATCH, + DELETE, + HEAD, + OPTIONS, + CONNECT, + TRACE +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/server/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/server/HTTPServerBinding.java new file mode 100644 index 00000000..62896d53 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/server/HTTPServerBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.http.v0._3_0.server; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes HTTP server binding. + * + * @version 0.3.0 + * @see HTTP server binding + * @author Pavel Bodiachevskii + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HTTPServerBinding extends com.asyncapi.bindings.http.HTTPServerBinding { + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTP.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTP.java new file mode 100644 index 00000000..e56243cd --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTP.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.http; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("HTTP") +@SelectPackages("com.asyncapi.bindings.http") +public class HTTP { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPLatestTest.java new file mode 100644 index 00000000..65f66df8 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.http.v0._3_0.channel.HTTPChannelBinding; +import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding; +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding; +import com.asyncapi.bindings.http.v0._3_0.server.HTTPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class HTTPLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = HTTPV0_3_0Test.channelBinding(); + super.bindingTypeClass = HTTPChannelBinding.class; + super.pathToBindingJson = "/bindings/http/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = HTTPV0_3_0Test.messageBinding(); + super.bindingTypeClass = HTTPMessageBinding.class; + super.pathToBindingJson = "/bindings/http/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = HTTPV0_3_0Test.operationBinding(); + super.bindingTypeClass = HTTPOperationBinding.class; + super.pathToBindingJson = "/bindings/http/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = HTTPV0_3_0Test.serverBinding(); + super.bindingTypeClass = HTTPServerBinding.class; + super.pathToBindingJson = "/bindings/http/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPUnknownVersionTest.java new file mode 100644 index 00000000..e9cc9f4e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.http.v0._3_0.channel.HTTPChannelBinding; +import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding; +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding; +import com.asyncapi.bindings.http.v0._3_0.server.HTTPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class HTTPUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = HTTPV0_3_0Test.channelBinding(); + super.bindingTypeClass = HTTPChannelBinding.class; + super.pathToBindingJson = "/bindings/http/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = HTTPV0_3_0Test.messageBinding(); + super.bindingTypeClass = HTTPMessageBinding.class; + super.pathToBindingJson = "/bindings/http/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = HTTPV0_3_0Test.operationBinding(); + super.bindingTypeClass = HTTPOperationBinding.class; + super.pathToBindingJson = "/bindings/http/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = HTTPV0_3_0Test.serverBinding(); + super.bindingTypeClass = HTTPServerBinding.class; + super.pathToBindingJson = "/bindings/http/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java new file mode 100644 index 00000000..13dc856d --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java @@ -0,0 +1,105 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding; +import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding; +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding; +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod; +import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType; +import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +@DisplayName("0.1.0") +public class HTTPV0_1_0Test { + + public static HTTPChannelBinding channelBinding () { + return new HTTPChannelBinding(); + } + + public static HTTPMessageBinding messageBinding () { + return HTTPMessageBinding.builder() + .headers(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(Map.ofEntries( + Map.entry("Content-Type", AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("application/json")) + .build()) + )) + .build() + ) + .build(); + } + + public static HTTPOperationBinding operationBinding () { + return HTTPOperationBinding.builder() + .type(HTTPOperationType.REQUEST) + .method(HTTPOperationMethod.GET) + .query(AsyncAPISchema.builder() + .type(Type.OBJECT) + .required(List.of("companyId")) + .properties(Map.ofEntries( + Map.entry("companyId", AsyncAPISchema.builder() + .type(Type.NUMBER) + .minimum(BigDecimal.ONE) + .description("The Id of the company.") + .build()) + )) + .additionalProperties(false) + .build() + ) + .build(); + } + + public static HTTPServerBinding serverBinding () { + return new HTTPServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = HTTPChannelBinding.class; + super.pathToBindingJson = "/bindings/http/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = HTTPMessageBinding.class; + super.pathToBindingJson = "/bindings/http/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = HTTPOperationBinding.class; + super.pathToBindingJson = "/bindings/http/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = HTTPServerBinding.class; + super.pathToBindingJson = "/bindings/http/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java new file mode 100644 index 00000000..95ca7ba4 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java @@ -0,0 +1,103 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.http.v0._2_0.channel.HTTPChannelBinding; +import com.asyncapi.bindings.http.v0._2_0.message.HTTPMessageBinding; +import com.asyncapi.bindings.http.v0._2_0.operation.HTTPOperationBinding; +import com.asyncapi.bindings.http.v0._2_0.operation.HTTPOperationMethod; +import com.asyncapi.bindings.http.v0._2_0.server.HTTPServerBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +@DisplayName("0.2.0") +public class HTTPV0_2_0Test { + + public static HTTPChannelBinding channelBinding () { + return new HTTPChannelBinding(); + } + + public static HTTPMessageBinding messageBinding () { + return HTTPMessageBinding.builder() + .headers(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(Map.ofEntries( + Map.entry("Content-Type", AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("application/json")) + .build()) + )) + .build() + ) + .build(); + } + + public static HTTPOperationBinding operationBinding () { + return HTTPOperationBinding.builder() + .method(HTTPOperationMethod.GET) + .query(AsyncAPISchema.builder() + .type(Type.OBJECT) + .required(List.of("companyId")) + .properties(Map.ofEntries( + Map.entry("companyId", AsyncAPISchema.builder() + .type(Type.NUMBER) + .minimum(BigDecimal.ONE) + .description("The Id of the company.") + .build()) + )) + .additionalProperties(false) + .build() + ) + .build(); + } + + public static HTTPServerBinding serverBinding () { + return new HTTPServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = HTTPChannelBinding.class; + super.pathToBindingJson = "/bindings/http/0.2.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.2.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.2.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = HTTPMessageBinding.class; + super.pathToBindingJson = "/bindings/http/0.2.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.2.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.2.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = HTTPOperationBinding.class; + super.pathToBindingJson = "/bindings/http/0.2.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.2.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.2.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = HTTPServerBinding.class; + super.pathToBindingJson = "/bindings/http/0.2.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.2.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.2.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java new file mode 100644 index 00000000..48f5dd31 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java @@ -0,0 +1,104 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.http.v0._3_0.channel.HTTPChannelBinding; +import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding; +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding; +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod; +import com.asyncapi.bindings.http.v0._3_0.server.HTTPServerBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +@DisplayName("0.3.0") +public class HTTPV0_3_0Test { + + public static HTTPChannelBinding channelBinding () { + return new HTTPChannelBinding(); + } + + public static HTTPMessageBinding messageBinding () { + return HTTPMessageBinding.builder() + .headers(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(Map.ofEntries( + Map.entry("Content-Type", AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("application/json")) + .build()) + )) + .build() + ) + .statusCode(200) + .build(); + } + + public static HTTPOperationBinding operationBinding () { + return HTTPOperationBinding.builder() + .method(HTTPOperationMethod.GET) + .query(AsyncAPISchema.builder() + .type(Type.OBJECT) + .required(List.of("companyId")) + .properties(Map.ofEntries( + Map.entry("companyId", AsyncAPISchema.builder() + .type(Type.NUMBER) + .minimum(BigDecimal.ONE) + .description("The Id of the company.") + .build()) + )) + .additionalProperties(false) + .build() + ) + .build(); + } + + public static HTTPServerBinding serverBinding () { + return new HTTPServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = HTTPChannelBinding.class; + super.pathToBindingJson = "/bindings/http/0.3.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.3.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.3.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = HTTPMessageBinding.class; + super.pathToBindingJson = "/bindings/http/0.3.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.3.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.3.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = HTTPOperationBinding.class; + super.pathToBindingJson = "/bindings/http/0.3.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.3.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.3.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = HTTPServerBinding.class; + super.pathToBindingJson = "/bindings/http/0.3.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/0.3.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/0.3.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPWithoutVersionTest.java new file mode 100644 index 00000000..f0356064 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.http; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.http.v0._3_0.channel.HTTPChannelBinding; +import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding; +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding; +import com.asyncapi.bindings.http.v0._3_0.server.HTTPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class HTTPWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = HTTPV0_3_0Test.channelBinding(); + super.bindingTypeClass = HTTPChannelBinding.class; + super.pathToBindingJson = "/bindings/http/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = HTTPV0_3_0Test.messageBinding(); + super.bindingTypeClass = HTTPMessageBinding.class; + super.pathToBindingJson = "/bindings/http/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = HTTPV0_3_0Test.operationBinding(); + super.bindingTypeClass = HTTPOperationBinding.class; + super.pathToBindingJson = "/bindings/http/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = HTTPV0_3_0Test.serverBinding(); + super.bindingTypeClass = HTTPServerBinding.class; + super.pathToBindingJson = "/bindings/http/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/http/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/http/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt deleted file mode 100644 index 9a2bcb3b..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBindingTest.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.asyncapi.bindings.http.v0._1_0.message - -import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.Type - -class HTTPMessageBindingTest: SerDeTest() { - - override fun objectClass() = HTTPMessageBinding::class.java - - override fun baseObjectJson() = "/bindings/http/message/httpMessageBinding.json" - - override fun extendedObjectJson() = "/bindings/http/message/httpMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/http/message/httpMessageBinding - wrongly extended.json" - - override fun build(): HTTPMessageBinding { - return HTTPMessageBinding.builder() - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(mapOf( - Pair( - "Content-Type", - AsyncAPISchema.builder() - .type(Type.STRING) - .enumValue(listOf("application/json")) - .build() - ) - )) - .build()) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt deleted file mode 100644 index 3823cf6d..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBindingTest.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.asyncapi.bindings.http.v0._1_0.operation - -import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.Type -import java.math.BigDecimal - -class HTTPOperationBindingTest: SerDeTest() { - - override fun objectClass() = HTTPOperationBinding::class.java - - override fun baseObjectJson() = "/bindings/http/operation/httpOperationBinding.json" - - override fun extendedObjectJson() = "/bindings/http/operation/httpOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/http/operation/httpOperationBinding - wrongly extended.json" - - override fun build(): HTTPOperationBinding { - return HTTPOperationBinding.builder() - .type(HTTPOperationType.REQUEST) - .method(HTTPOperationMethod.GET) - .query(AsyncAPISchema.builder() - .type(Type.OBJECT) - .required(listOf("companyId")) - .properties(mapOf( - Pair( - "companyId", - AsyncAPISchema.builder() - .type(Type.NUMBER) - .minimum(BigDecimal.ONE) - .description("The Id of the company.") - .build() - ) - )) - .additionalProperties(false) - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt index 36daaa59..fdcfc573 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt @@ -8,9 +8,8 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType +import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme import com.asyncapi.v3.schema.AsyncAPISchema @@ -68,7 +67,6 @@ class GitterStreaming: AbstractExampleValidationTest() { .subscribe(Operation.builder() .bindings(mapOf( Pair("http", HTTPOperationBinding.builder() - .type(HTTPOperationType.RESPONSE) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt index 8a122739..0787de9b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt @@ -1,17 +1,16 @@ package com.asyncapi.examples.v2._0_0 import com.asyncapi.Reference +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme +import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow class OperationSecurity: AbstractExampleValidationTest() { @@ -36,7 +35,6 @@ class OperationSecurity: AbstractExampleValidationTest() { .message(Reference("#/components/messages/message")) .bindings(mapOf( Pair("http", HTTPOperationBinding.builder() - .type(HTTPOperationType.REQUEST) .method(HTTPOperationMethod.POST) .build()) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt index a57572af..a3d37279 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt @@ -9,9 +9,8 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType +import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme import com.asyncapi.v3.schema.AsyncAPISchema @@ -69,7 +68,6 @@ class GitterStreaming: AbstractExampleValidationTest() { .subscribe(Operation.builder() .bindings(mapOf( Pair("http", HTTPOperationBinding.builder() - .type(HTTPOperationType.RESPONSE) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt index 640d7fde..5470dd5b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt @@ -6,9 +6,8 @@ import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme @@ -36,7 +35,6 @@ class OperationSecurity: AbstractExampleValidationTest() { .message(Reference("#/components/messages/message")) .bindings(mapOf( Pair("http", HTTPOperationBinding.builder() - .type(HTTPOperationType.REQUEST) .method(HTTPOperationMethod.POST) .build()) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index 7ad9abcb..025518e1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -1,7 +1,9 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBinding import com.asyncapi.Reference +import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.Message @@ -10,8 +12,6 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.JsonSchema import com.asyncapi.v3.schema.multiformat.JsonFormatSchema @@ -274,7 +274,9 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { .build() ) )) - .build()) + .build() + ) + .statusCode(200) .build() ) )) @@ -304,7 +306,9 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { .build() ) )) - .build()) + .build() + ) + .statusCode(200) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt index dfc37776..a000152c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt @@ -1,14 +1,14 @@ package com.asyncapi.examples.v3._0_0 import com.asyncapi.Reference +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding +import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBinding -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index e0c002fa..e8327302 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test -import com.asyncapi.bindings.http.v0._1_0.channel.HTTPChannelBinding +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest @@ -59,7 +59,7 @@ class ChannelItemTest: SerDeTest() { Pair("amqp1", AMQP1ChannelBinding()), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), - Pair("http", HTTPChannelBinding()), + Pair("http", HTTPV0_3_0Test.channelBinding()), Pair("ibmmq", IBMMQChannelBindingTest().build()), Pair("jms", JMSChannelBinding()), Pair("kafka", KafkaChannelBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index b0e88b67..0281c9df 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest @@ -118,7 +118,7 @@ class MessageTest: SerDeTest() { Pair("amqp1", AMQP1MessageBinding()), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", JMSMessageBinding()), Pair("kafka", KafkaMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index f30c4598..cbb673f3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest @@ -77,7 +77,7 @@ class MessageTraitTest: SerDeTest() { Pair("amqp1", AMQP1MessageBinding()), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", JMSMessageBinding()), Pair("kafka", KafkaMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 40218a71..fe5ae4b5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest @@ -105,7 +105,7 @@ class OperationTest { Pair("amqp1", AMQP1OperationBinding()), Pair("anypointmq", AnypointMQOperationBinding()), Pair("googlepubsub", GooglePubSubV0_2_0Test.operationBinding()), - Pair("http", HTTPOperationBindingTest().build()), + Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", IBMMQOperationBinding()), Pair("jms", JMSOperationBinding()), Pair("kafka", KafkaOperationBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 9c9fad4e..866e0080 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest @@ -54,7 +54,7 @@ class OperationTraitTest: SerDeTest() { Pair("amqp1", AMQP1OperationBinding()), Pair("anypointmq", AnypointMQOperationBinding()), Pair("googlepubsub", GooglePubSubV0_2_0Test.operationBinding()), - Pair("http", HTTPOperationBindingTest().build()), + Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", IBMMQOperationBinding()), Pair("jms", JMSOperationBinding()), Pair("kafka", KafkaOperationBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index aaddfdc2..58c954b8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.bindings.ServerBinding import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test -import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding @@ -65,7 +65,7 @@ class ServerTest: SerDeTest() { Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), - Pair("http", HTTPServerBinding()), + Pair("http", HTTPV0_3_0Test.serverBinding()), Pair( "ibmmq", IBMMQServerBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index 4daf1f2d..4984291d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest @@ -92,7 +92,7 @@ class MessageTest: SerDeTest() { Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 9bfc1f89..b0088816 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest @@ -64,7 +64,7 @@ class MessageTraitTest: SerDeTest() { Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 52240074..dae98eff 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.message.MessageTest import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest @@ -140,7 +140,7 @@ class OperationTest { Pair("amqp1", Reference("#/components/operationBindings/amqp1")), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), - Pair("http", HTTPOperationBindingTest().build()), + Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaOperationBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 519c679c..414e8850 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest @@ -44,7 +44,7 @@ class OperationTraitTest: SerDeTest() { Pair("amqp1", Reference("#/components/operationBindings/amqp1")), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), - Pair("http", HTTPOperationBindingTest().build()), + Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaOperationBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index de9125c0..acf5974e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test -import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding @@ -72,7 +72,7 @@ class ServerTest: SerDeTest() { Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), - Pair("http", HTTPServerBinding()), + Pair("http", HTTPV0_3_0Test.serverBinding()), Pair( "ibmmq", IBMMQServerBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 12b3e6ef..58952e88 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest @@ -88,7 +88,7 @@ class MessageTestWithSchema: SerDeTest() { Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), @@ -141,7 +141,7 @@ class MessageTestWithReference: SerDeTest() { Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), @@ -231,7 +231,7 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 21237651..178d2738 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test -import com.asyncapi.bindings.http.v0._1_0.message.HTTPMessageBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest @@ -63,7 +63,7 @@ class MessageTraitTestWithSchema: SerDeTest() { Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), @@ -118,7 +118,7 @@ class MessageTraitTestWithReference: SerDeTest() { Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), @@ -190,7 +190,7 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { Pair("amqp1", Reference("#/components/messageBindings/amqp1")), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), - Pair("http", HTTPMessageBindingTest().build()), + Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQMessageBindingTest().build()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 5d1ac7c9..fde673a3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest @@ -71,7 +71,7 @@ class OperationTest: SerDeTest() { Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub") ), - Pair("http", HTTPOperationBindingTest().build()), + Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaOperationBindingTest().build()), @@ -129,7 +129,7 @@ class OperationTestWithReference: SerDeTest() { Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub") ), - Pair("http", HTTPOperationBindingTest().build()), + Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaOperationBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 4b643d7c..1b1f7ccc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.AMQPV0_2_0Test -import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationBindingTest +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest @@ -51,7 +51,7 @@ class OperationTraitTest: SerDeTest() { Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub") ), - Pair("http", HTTPOperationBindingTest().build()), + Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaOperationBindingTest().build()), @@ -111,7 +111,7 @@ class OperationTraitTestWithReference: SerDeTest() { Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub") ), - Pair("http", HTTPOperationBindingTest().build()), + Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaOperationBindingTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 769d2979..af387456 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test -import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding +import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding @@ -82,7 +82,7 @@ class ServerTest: SerDeTest() { Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), - Pair("http", HTTPServerBinding()), + Pair("http", HTTPV0_3_0Test.serverBinding()), Pair( "ibmmq", IBMMQServerBinding.builder() @@ -199,7 +199,7 @@ class ServerTestWithReference: SerDeTest() { Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), - Pair("http", HTTPServerBinding()), + Pair("http", HTTPV0_3_0Test.serverBinding()), Pair( "ibmmq", IBMMQServerBinding.builder() diff --git a/asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.1.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/http/0.1.0/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/http/0.1.0/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/http/message/httpMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/http/0.1.0/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/http/0.1.0/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/http/0.1.0/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/http/operation/httpOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/http/0.1.0/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.1.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding - extended.json new file mode 100644 index 00000000..da145ec9 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.2.0", + "headers" : { + "type" : "object", + "properties" : { + "Content-Type" : { + "type" : "string", + "enum" : [ "application/json" ] + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..8a7a3e9f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding - wrongly extended.json @@ -0,0 +1,20 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding.json new file mode 100644 index 00000000..db63292c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/message/binding.json @@ -0,0 +1,14 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding - extended.json new file mode 100644 index 00000000..53f3fd82 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.2.0", + "method" : "GET", + "query" : { + "type" : "object", + "required" : [ "companyId" ], + "properties" : { + "companyId" : { + "type" : "number", + "minimum" : 1, + "description" : "The Id of the company." + } + }, + "additionalProperties" : false + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..01e319f5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding - wrongly extended.json @@ -0,0 +1,24 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding.json new file mode 100644 index 00000000..0cd59c15 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/operation/binding.json @@ -0,0 +1,18 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.2.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..943a1361 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding.json new file mode 100644 index 00000000..4c2843f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding - extended.json new file mode 100644 index 00000000..04ea597e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.3.0", + "headers" : { + "type" : "object", + "properties" : { + "Content-Type" : { + "type" : "string", + "enum" : [ "application/json" ] + } + } + }, + "statusCode" : 200, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..6713a48d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "statusCode": 200, + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding.json new file mode 100644 index 00000000..252654a3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/message/binding.json @@ -0,0 +1,15 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "statusCode": 200, + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding - extended.json new file mode 100644 index 00000000..af380825 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.3.0", + "method" : "GET", + "query" : { + "type" : "object", + "required" : [ "companyId" ], + "properties" : { + "companyId" : { + "type" : "number", + "minimum" : 1, + "description" : "The Id of the company." + } + }, + "additionalProperties" : false + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..856e3480 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding - wrongly extended.json @@ -0,0 +1,24 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding.json new file mode 100644 index 00000000..90841995 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/operation/binding.json @@ -0,0 +1,18 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..943a1361 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding.json new file mode 100644 index 00000000..4c2843f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/0.3.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/latest/channel/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/http/latest/channel/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/latest/message/binding - extended.json new file mode 100644 index 00000000..04ea597e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/message/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.3.0", + "headers" : { + "type" : "object", + "properties" : { + "Content-Type" : { + "type" : "string", + "enum" : [ "application/json" ] + } + } + }, + "statusCode" : 200, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..0ac43781 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/message/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "statusCode": 200, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/http/latest/message/binding.json new file mode 100644 index 00000000..a9a9a5fa --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/message/binding.json @@ -0,0 +1,15 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "statusCode": 200, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/latest/operation/binding - extended.json new file mode 100644 index 00000000..af380825 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/operation/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.3.0", + "method" : "GET", + "query" : { + "type" : "object", + "required" : [ "companyId" ], + "properties" : { + "companyId" : { + "type" : "number", + "minimum" : 1, + "description" : "The Id of the company." + } + }, + "additionalProperties" : false + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..70ad77e6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/operation/binding - wrongly extended.json @@ -0,0 +1,24 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/http/latest/operation/binding.json new file mode 100644 index 00000000..ee1efe89 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/operation/binding.json @@ -0,0 +1,18 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/latest/server/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/http/latest/server/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/latest/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding - extended.json new file mode 100644 index 00000000..04ea597e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.3.0", + "headers" : { + "type" : "object", + "properties" : { + "Content-Type" : { + "type" : "string", + "enum" : [ "application/json" ] + } + } + }, + "statusCode" : 200, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..ed22e53c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "statusCode": 200, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding.json new file mode 100644 index 00000000..f98355ec --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/message/binding.json @@ -0,0 +1,15 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "statusCode": 200, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..af380825 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.3.0", + "method" : "GET", + "query" : { + "type" : "object", + "required" : [ "companyId" ], + "properties" : { + "companyId" : { + "type" : "number", + "minimum" : 1, + "description" : "The Id of the company." + } + }, + "additionalProperties" : false + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..ad5af93b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,24 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding.json new file mode 100644 index 00000000..ff6535d0 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/operation/binding.json @@ -0,0 +1,18 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/unknown version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - extended.json new file mode 100644 index 00000000..04ea597e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.3.0", + "headers" : { + "type" : "object", + "properties" : { + "Content-Type" : { + "type" : "string", + "enum" : [ "application/json" ] + } + } + }, + "statusCode" : 200, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..ee24526c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "statusCode": 200, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding.json new file mode 100644 index 00000000..d60969fa --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding.json @@ -0,0 +1,15 @@ +{ + "headers": { + "type": "object", + "properties": { + "Content-Type": { + "type": "string", + "enum": [ + "application/json" + ] + } + } + }, + "statusCode": 200, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - extended.json new file mode 100644 index 00000000..af380825 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.3.0", + "method" : "GET", + "query" : { + "type" : "object", + "required" : [ "companyId" ], + "properties" : { + "companyId" : { + "type" : "number", + "minimum" : 1, + "description" : "The Id of the company." + } + }, + "additionalProperties" : false + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..7b223911 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - wrongly extended.json @@ -0,0 +1,24 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding.json new file mode 100644 index 00000000..8ba98984 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding.json @@ -0,0 +1,18 @@ +{ + "method": "GET", + "query": { + "type": "object", + "required": [ + "companyId" + ], + "properties": { + "companyId": { + "type": "number", + "minimum": 1, + "description": "The Id of the company." + } + }, + "additionalProperties": false + }, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/examples/v2.0.0/gitter-streaming.yml b/asyncapi-core/src/test/resources/examples/v2.0.0/gitter-streaming.yml index 85ed148f..9e130089 100644 --- a/asyncapi-core/src/test/resources/examples/v2.0.0/gitter-streaming.yml +++ b/asyncapi-core/src/test/resources/examples/v2.0.0/gitter-streaming.yml @@ -30,8 +30,7 @@ channels: - events subscribe: bindings: - http: - type: response + http: {} message: $ref: '#/components/messages/chatMessage' diff --git a/asyncapi-core/src/test/resources/examples/v2.0.0/operation-security.yml b/asyncapi-core/src/test/resources/examples/v2.0.0/operation-security.yml index c0f77bc2..4f60f609 100644 --- a/asyncapi-core/src/test/resources/examples/v2.0.0/operation-security.yml +++ b/asyncapi-core/src/test/resources/examples/v2.0.0/operation-security.yml @@ -12,7 +12,6 @@ channels: $ref: '#/components/messages/message' bindings: http: - type: request method: POST components: messages: diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/gitter-streaming.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/gitter-streaming.yml index 335286be..a815a8ec 100644 --- a/asyncapi-core/src/test/resources/examples/v2.6.0/gitter-streaming.yml +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/gitter-streaming.yml @@ -30,8 +30,7 @@ channels: - events subscribe: bindings: - http: - type: response + http: {} message: oneOf: - $ref: '#/components/messages/chatMessage' diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/operation-security.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/operation-security.yml index fed5e202..acf2b6a0 100644 --- a/asyncapi-core/src/test/resources/examples/v2.6.0/operation-security.yml +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/operation-security.yml @@ -12,7 +12,6 @@ channels: $ref: '#/components/messages/message' bindings: http: - type: request method: POST security: - petstore_auth: diff --git a/asyncapi-core/src/test/resources/examples/v3.0.0/gitter-streaming-asyncapi.yml b/asyncapi-core/src/test/resources/examples/v3.0.0/gitter-streaming-asyncapi.yml index fda2c45e..9c957476 100644 --- a/asyncapi-core/src/test/resources/examples/v3.0.0/gitter-streaming-asyncapi.yml +++ b/asyncapi-core/src/test/resources/examples/v3.0.0/gitter-streaming-asyncapi.yml @@ -157,6 +157,7 @@ components: Trailer: type: string const: \r\n + statusCode: 200 heartbeat: summary: Its purpose is to keep the connection alive. payload: @@ -175,4 +176,5 @@ components: const: chunked Trailer: type: string - const: \r\n \ No newline at end of file + const: \r\n + statusCode: 200 \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index a6ce675e..0c78a705 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -46,7 +46,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -144,8 +146,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -263,8 +264,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -385,8 +385,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -504,8 +503,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -657,7 +655,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -666,7 +664,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -773,7 +772,9 @@ "name" : "projects/your-project/schemas/message-proto" } }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "destinationType" : "topic", @@ -961,7 +962,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -970,7 +971,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1183,8 +1185,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -1327,7 +1328,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1336,7 +1337,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1402,7 +1404,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -1494,7 +1498,9 @@ "name" : "projects/your-project/schemas/message-proto" } }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "destinationType" : "topic", @@ -1598,8 +1604,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -1704,7 +1709,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1713,7 +1718,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json index 1664c657..ab1af5c9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json @@ -133,7 +133,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -147,7 +146,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -252,7 +251,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -268,7 +266,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, @@ -378,7 +376,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -392,7 +389,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -497,7 +494,6 @@ "anypointmq": { }, "googlepubsub": { }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -513,7 +509,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { }, "jms": { }, @@ -665,7 +661,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -976,7 +973,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1187,7 +1185,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -1203,7 +1200,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, @@ -1345,7 +1342,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1598,7 +1596,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -1612,7 +1609,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -1711,7 +1708,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index e10b5662..cdf89275 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -40,8 +40,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -159,8 +158,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -281,8 +279,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -400,8 +397,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -553,7 +549,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -562,7 +558,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -669,7 +666,9 @@ "name" : "projects/your-project/schemas/message-proto" } }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "destinationType" : "topic", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json index 9b6cc41d..ef7da0d7 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json @@ -36,7 +36,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -50,7 +49,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -155,7 +154,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -171,7 +169,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, @@ -281,7 +279,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -295,7 +292,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -400,7 +397,6 @@ "anypointmq": { }, "googlepubsub": { }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -416,7 +412,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { }, "jms": { }, @@ -568,7 +564,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json index a6ab4905..747df167 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json @@ -36,7 +36,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -50,7 +49,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -155,7 +154,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -171,7 +169,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, @@ -281,7 +279,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -295,7 +292,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -400,7 +397,6 @@ "anypointmq": { }, "googlepubsub": { }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -416,7 +412,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { }, "jms": { }, @@ -568,7 +564,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index e9b39d6c..0736fd8a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -73,7 +73,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -82,7 +82,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - wrongly extended.json index 07b8922b..c747ebca 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - wrongly extended.json @@ -80,7 +80,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message.json index 6cc96b2f..1c757572 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message.json @@ -80,7 +80,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 718fd527..7ca0e4cf 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -62,7 +62,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -71,7 +71,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - wrongly extended.json index e64abac3..4f3147eb 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - wrongly extended.json @@ -69,7 +69,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait.json index ff9d399a..2c1e57c2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait.json @@ -69,7 +69,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index eaa7a05f..a17fc37f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -38,8 +38,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -157,8 +156,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -310,7 +308,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -319,7 +317,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json index f0c50a9f..d83eca89 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json @@ -34,7 +34,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -48,7 +47,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -153,7 +152,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -169,7 +167,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, @@ -321,7 +319,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json index 3938d574..3eb3eacf 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json @@ -34,7 +34,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -48,7 +47,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -153,7 +152,6 @@ "anypointmq": { }, "googlepubsub": { }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -169,7 +167,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { }, "jms": { }, @@ -321,7 +319,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index 257ebc9f..d057ad7b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -38,8 +38,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -157,8 +156,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json index df38ea47..90a25b9b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json @@ -34,7 +34,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -48,7 +47,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -153,7 +152,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -169,7 +167,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json index 335850f2..b22c1e9c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json @@ -34,7 +34,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -48,7 +47,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -153,7 +152,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -169,7 +167,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 88e49b98..82f865dd 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -38,8 +38,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json index 208b0075..eb460f2a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json @@ -38,7 +38,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -54,7 +53,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json index c133052b..f35b6bf6 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json @@ -38,7 +38,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -54,7 +53,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 32949e56..31549965 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -104,7 +104,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -113,7 +113,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -326,8 +327,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -470,7 +470,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -479,7 +479,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -545,7 +546,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -637,7 +640,9 @@ "name" : "projects/your-project/schemas/message-proto" } }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "destinationType" : "topic", @@ -741,8 +746,7 @@ "bindingVersion" : "0.2.0" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -847,7 +851,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -856,7 +860,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - wrongly extended.json index bc4b8418..d8f07acc 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - wrongly extended.json @@ -111,7 +111,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -322,7 +323,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -338,7 +338,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, @@ -480,7 +480,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -733,7 +734,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -747,7 +747,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -846,7 +846,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json index f2cfe194..fd2c807f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json @@ -111,7 +111,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -322,7 +323,6 @@ "anypointmq": {}, "googlepubsub": {}, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -338,7 +338,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": {}, "jms": {}, @@ -480,7 +480,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -733,7 +734,6 @@ "anypointmq" : { }, "googlepubsub" : { }, "http" : { - "type" : "request", "method" : "GET", "query" : { "type" : "object", @@ -747,7 +747,7 @@ }, "additionalProperties" : false }, - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.3.0" }, "ibmmq" : { }, "jms" : { }, @@ -846,7 +846,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index 2ac13418..a071e10f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -26,7 +26,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 3992d899..c4ac4c7c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -55,7 +55,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -161,8 +163,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -297,8 +298,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -468,7 +468,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -477,7 +477,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -598,8 +599,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -734,8 +734,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -902,7 +901,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -911,7 +910,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1205,7 +1205,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -1321,8 +1323,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -1457,8 +1458,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -1628,7 +1628,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1637,7 +1637,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1758,8 +1759,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -1894,8 +1894,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -2062,7 +2061,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2071,7 +2070,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2373,7 +2373,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2382,7 +2382,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2626,8 +2627,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -2788,7 +2788,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2797,7 +2797,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2887,7 +2888,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -3101,8 +3104,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -3221,7 +3223,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3230,7 +3232,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json index 8684ba91..85c47dd3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json @@ -168,7 +168,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -184,7 +183,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -329,7 +328,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -345,7 +343,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -525,7 +523,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -661,7 +660,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -677,7 +675,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -822,7 +820,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -838,7 +835,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -1013,7 +1010,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1457,7 +1455,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -1473,7 +1470,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -1618,7 +1615,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -1634,7 +1630,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -1814,7 +1810,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1950,7 +1947,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -1966,7 +1962,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -2111,7 +2107,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -2127,7 +2122,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -2302,7 +2297,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2634,7 +2630,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2892,7 +2889,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -2908,7 +2904,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -3076,7 +3072,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3393,7 +3390,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -3409,7 +3405,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -3537,7 +3533,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json index 2c8ac817..c04dfb99 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json @@ -44,8 +44,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -180,8 +179,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -351,7 +349,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -360,7 +358,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -481,8 +480,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -617,8 +615,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -785,7 +782,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -794,7 +791,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json index b0b28043..cb857fe3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json @@ -56,7 +56,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -72,7 +71,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -217,7 +216,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -233,7 +231,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -413,7 +411,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -549,7 +548,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -565,7 +563,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -710,7 +708,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -726,7 +723,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -901,7 +898,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json index eb5ac519..fe6406ca 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json @@ -56,7 +56,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -72,7 +71,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -217,7 +216,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -233,7 +231,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -413,7 +411,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -549,7 +548,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -565,7 +563,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -710,7 +708,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -726,7 +723,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -901,7 +898,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json index 4400042c..22cead65 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json @@ -74,7 +74,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -83,7 +83,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json index 7caf1254..bcfd1430 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json @@ -83,7 +83,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json index ce97a10f..52120fef 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json @@ -83,7 +83,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json index eb2abc06..f40f2f37 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json @@ -63,7 +63,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -72,7 +72,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json index 9fdd8bf8..e5b458aa 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json @@ -72,7 +72,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json index 0b188b7a..6bf2b6ba 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json @@ -72,7 +72,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json index 435dd64b..d87f7c1f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json @@ -88,7 +88,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json index 1b1ad060..5c6feaa3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json @@ -41,8 +41,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -177,8 +176,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -345,7 +343,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -354,7 +352,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json index 68896895..7be3b9b9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json @@ -51,7 +51,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -67,7 +66,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -212,7 +211,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -228,7 +226,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -403,7 +401,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json index 0ee336e6..3eaa6f85 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json @@ -41,8 +41,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -177,8 +176,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -348,7 +346,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -357,7 +355,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json index 0980fcbc..c889a632 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json @@ -51,7 +51,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -67,7 +66,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -212,7 +211,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -228,7 +226,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -408,7 +406,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json index 18ca41cb..aa6c6d0b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json @@ -51,7 +51,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -67,7 +66,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -212,7 +211,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -228,7 +226,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -408,7 +406,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json index a92725a4..9a450a2a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json @@ -41,8 +41,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -177,8 +176,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json index a283b17e..7b9dc4c2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json @@ -51,7 +51,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -67,7 +66,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -212,7 +211,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -228,7 +226,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json index 56fd6fd1..8094e789 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json @@ -51,7 +51,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -67,7 +66,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -212,7 +211,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -228,7 +226,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json index 80f7e485..03e8e89f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json @@ -41,8 +41,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json index 068d76a5..9e94323b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json @@ -51,7 +51,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -67,7 +66,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json index 2a102376..42d31af2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json @@ -51,7 +51,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -67,7 +66,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index d493e1b2..5947528c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -67,7 +67,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -183,8 +185,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -319,8 +320,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -490,7 +490,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -499,7 +499,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -620,8 +621,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -756,8 +756,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -924,7 +923,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -933,7 +932,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1235,7 +1235,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1244,7 +1244,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1488,8 +1489,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -1650,7 +1650,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1659,7 +1659,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1749,7 +1750,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -1963,8 +1966,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -2083,7 +2085,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2092,7 +2094,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json index fb628bf6..95208d23 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json @@ -196,7 +196,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -212,7 +211,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -357,7 +356,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -373,7 +371,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -553,7 +551,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -689,7 +688,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -705,7 +703,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -850,7 +848,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -866,7 +863,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -1041,7 +1038,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1373,7 +1371,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1631,7 +1630,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -1647,7 +1645,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -1815,7 +1813,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2132,7 +2131,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -2148,7 +2146,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -2276,7 +2274,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 451362a3..a2f64a81 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -36,7 +36,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 50ed2309..68afe87d 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -82,7 +82,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -191,7 +193,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -339,7 +343,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -348,7 +352,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -472,7 +477,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -481,7 +486,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -605,7 +611,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -614,7 +620,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -752,7 +759,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -761,7 +768,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -924,7 +932,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -933,7 +941,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1057,7 +1066,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1066,7 +1075,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1190,7 +1200,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1199,7 +1209,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1337,7 +1348,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1346,7 +1357,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1488,7 +1500,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1497,7 +1509,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1621,7 +1634,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1630,7 +1643,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1754,7 +1768,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1763,7 +1777,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1901,7 +1916,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1910,7 +1925,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2256,7 +2272,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2265,7 +2281,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2389,7 +2406,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2398,7 +2415,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2522,7 +2540,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2531,7 +2549,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2669,7 +2688,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2678,7 +2697,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2841,7 +2861,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2850,7 +2870,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2974,7 +2995,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2983,7 +3004,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3107,7 +3129,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3116,7 +3138,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3254,7 +3277,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3263,7 +3286,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3405,7 +3429,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3414,7 +3438,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3538,7 +3563,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3547,7 +3572,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3671,7 +3697,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3680,7 +3706,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3818,7 +3845,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3827,7 +3854,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -4141,8 +4169,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4281,8 +4308,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4420,8 +4446,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4590,8 +4615,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4730,8 +4754,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4869,8 +4892,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -5064,7 +5086,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -5223,7 +5247,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5232,7 +5256,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5356,7 +5381,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5365,7 +5390,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5489,7 +5515,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5498,7 +5524,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5636,7 +5663,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5645,7 +5672,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5808,7 +5836,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5817,7 +5845,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5941,7 +5970,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5950,7 +5979,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6074,7 +6104,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6083,7 +6113,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6221,7 +6252,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6230,7 +6261,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6372,7 +6404,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6381,7 +6413,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6505,7 +6538,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6514,7 +6547,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6638,7 +6672,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6647,7 +6681,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6785,7 +6820,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6794,7 +6829,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7140,7 +7176,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7149,7 +7185,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7273,7 +7310,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7282,7 +7319,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7406,7 +7444,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7415,7 +7453,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7553,7 +7592,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7562,7 +7601,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7725,7 +7765,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7734,7 +7774,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7858,7 +7899,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7867,7 +7908,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7991,7 +8033,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -8000,7 +8042,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -8138,7 +8181,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -8147,7 +8190,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -8289,7 +8333,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -8298,7 +8342,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -8422,7 +8467,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -8431,7 +8476,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -8555,7 +8601,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -8564,7 +8610,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -8702,7 +8749,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -8711,7 +8758,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -9025,8 +9073,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -9165,8 +9212,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -9304,8 +9350,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -9474,8 +9519,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -9614,8 +9658,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -9753,8 +9796,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -9969,7 +10011,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -9978,7 +10020,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -10102,7 +10145,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -10111,7 +10154,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -10235,7 +10279,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -10244,7 +10288,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -10382,7 +10427,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -10391,7 +10436,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -10554,7 +10600,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -10563,7 +10609,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -10687,7 +10734,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -10696,7 +10743,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -10820,7 +10868,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -10829,7 +10877,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -10967,7 +11016,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -10976,7 +11025,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -11118,7 +11168,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -11127,7 +11177,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -11251,7 +11302,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -11260,7 +11311,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -11384,7 +11436,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -11393,7 +11445,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -11531,7 +11584,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -11540,7 +11593,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -11807,8 +11861,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -11947,8 +12000,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -12096,7 +12148,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -12105,7 +12157,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -12243,7 +12296,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -12252,7 +12305,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -12378,7 +12432,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -12387,7 +12441,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -12489,7 +12544,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -12703,8 +12760,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -12823,7 +12879,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -12832,7 +12888,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json index cacc25aa..8e189633 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json @@ -351,7 +351,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -500,7 +501,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -638,7 +640,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -789,7 +792,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -954,7 +958,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1103,7 +1108,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1241,7 +1247,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1392,7 +1399,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1535,7 +1543,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1684,7 +1693,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1822,7 +1832,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1973,7 +1984,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2345,7 +2357,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2494,7 +2507,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2632,7 +2646,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2783,7 +2798,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2948,7 +2964,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3097,7 +3114,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3235,7 +3253,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3386,7 +3405,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3529,7 +3549,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3678,7 +3699,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3816,7 +3838,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3967,7 +3990,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode": 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -4291,7 +4315,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4307,7 +4330,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -4455,7 +4478,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4471,7 +4493,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -4618,7 +4640,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4634,7 +4655,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -4819,7 +4840,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4835,7 +4855,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -4983,7 +5003,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4999,7 +5018,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -5146,7 +5165,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -5162,7 +5180,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -5542,7 +5560,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -5691,7 +5710,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -5829,7 +5849,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -5980,7 +6001,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6145,7 +6167,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6294,7 +6317,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6432,7 +6456,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6583,7 +6608,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6726,7 +6752,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6875,7 +6902,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -7013,7 +7041,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -7164,7 +7193,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -7536,7 +7566,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -7685,7 +7716,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -7823,7 +7855,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -7974,7 +8007,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -8139,7 +8173,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -8288,7 +8323,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -8426,7 +8462,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -8577,7 +8614,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -8720,7 +8758,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -8869,7 +8908,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -9007,7 +9047,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -9158,7 +9199,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -9482,7 +9524,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -9498,7 +9539,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -9646,7 +9687,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -9662,7 +9702,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -9809,7 +9849,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -9825,7 +9864,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -10010,7 +10049,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -10026,7 +10064,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -10174,7 +10212,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -10190,7 +10227,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -10337,7 +10374,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -10353,7 +10389,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -10600,7 +10636,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -10749,7 +10786,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -10887,7 +10925,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -11038,7 +11077,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -11203,7 +11243,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -11352,7 +11393,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -11490,7 +11532,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -11641,7 +11684,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -11784,7 +11828,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -11933,7 +11978,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -12071,7 +12117,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -12222,7 +12269,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -12493,7 +12541,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -12509,7 +12556,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -12656,7 +12703,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -12672,7 +12718,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -12838,7 +12884,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -12989,7 +13036,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -13127,7 +13175,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -13444,7 +13493,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -13460,7 +13508,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -13588,7 +13636,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json index 475e2a67..c06efe37 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json @@ -87,7 +87,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -96,7 +96,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -220,7 +221,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -229,7 +230,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -353,7 +355,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -362,7 +364,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -500,7 +503,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -509,7 +512,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -672,7 +676,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -681,7 +685,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -805,7 +810,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -814,7 +819,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -938,7 +944,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -947,7 +953,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1085,7 +1092,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1094,7 +1101,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1236,7 +1244,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1245,7 +1253,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1369,7 +1378,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1378,7 +1387,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1502,7 +1512,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1511,7 +1521,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1649,7 +1660,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1658,7 +1669,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json index adbf036e..a9e169a2 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json @@ -87,7 +87,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -96,7 +96,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -220,7 +221,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -229,7 +230,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -353,7 +355,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -362,7 +364,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -500,7 +503,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -509,7 +512,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -672,7 +676,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -681,7 +685,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -805,7 +810,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -814,7 +819,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -938,7 +944,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -947,7 +953,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1085,7 +1092,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1094,7 +1101,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1236,7 +1244,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1245,7 +1253,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1369,7 +1378,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1378,7 +1387,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1502,7 +1512,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1511,7 +1521,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1649,7 +1660,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1658,7 +1669,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - wrongly extended.json index 2dba6547..4d0ba6f3 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - wrongly extended.json @@ -111,7 +111,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -260,7 +261,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -398,7 +400,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -549,7 +552,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -714,7 +718,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -863,7 +868,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1001,7 +1007,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1152,7 +1159,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1295,7 +1303,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1444,7 +1453,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1582,7 +1592,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1733,7 +1744,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference.json index a492cd68..ec2082bc 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference.json @@ -111,7 +111,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -260,7 +261,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -398,7 +400,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -549,7 +552,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -714,7 +718,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -863,7 +868,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1001,7 +1007,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1152,7 +1159,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1295,7 +1303,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1444,7 +1453,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1582,7 +1592,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1733,7 +1744,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel.json index 20388e10..4994cf23 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel.json @@ -111,7 +111,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -260,7 +261,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -398,7 +400,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -549,7 +552,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -714,7 +718,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -863,7 +868,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1001,7 +1007,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1152,7 +1159,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1295,7 +1303,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1444,7 +1453,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1582,7 +1592,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1733,7 +1744,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json index 6957cd9c..c23f50d6 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json @@ -59,7 +59,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -68,7 +68,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -192,7 +193,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -201,7 +202,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -325,7 +327,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -334,7 +336,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -472,7 +475,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -481,7 +484,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - wrongly extended.json index 5848c90f..e4b16f0f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - wrongly extended.json @@ -79,7 +79,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -228,7 +229,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -366,7 +368,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -517,7 +520,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json index 8853685d..28a56f16 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json @@ -64,7 +64,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -73,7 +73,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -197,7 +198,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -206,7 +207,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -330,7 +332,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -339,7 +341,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -477,7 +480,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -486,7 +489,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - wrongly extended.json index 798dea70..f63a9e27 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - wrongly extended.json @@ -84,7 +84,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -233,7 +234,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -371,7 +373,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -522,7 +525,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2.json index 140939d5..ac237541 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2.json @@ -84,7 +84,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -233,7 +234,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -371,7 +373,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -522,7 +525,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json index bf21a66b..1b9b4033 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json @@ -42,7 +42,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -51,7 +51,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -175,7 +176,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -184,7 +185,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -308,7 +310,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -317,7 +319,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -455,7 +458,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -464,7 +467,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - wrongly extended.json index e207c4e4..c5407278 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - wrongly extended.json @@ -62,7 +62,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -211,7 +212,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -349,7 +351,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -500,7 +503,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference.json index 60629b5b..b0d5abf0 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference.json @@ -62,7 +62,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -211,7 +212,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -349,7 +351,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -500,7 +503,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message.json index 225f0827..835353f5 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message.json @@ -79,7 +79,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -228,7 +229,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -366,7 +368,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -517,7 +520,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json index 6a7f477e..e36b2353 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json @@ -50,7 +50,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -59,7 +59,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - wrongly extended.json index 4e472db0..0bad188e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - wrongly extended.json @@ -70,7 +70,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json index d442597e..6b09cb9f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json @@ -52,7 +52,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -61,7 +61,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - wrongly extended.json index 372e9a77..291ddcb6 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - wrongly extended.json @@ -235,7 +235,8 @@ "then" : null, "else" : null }, - "bindingVersion" : "0.1.0" + "statusCode" : 200, + "bindingVersion" : "0.3.0" }, "ibmmq" : { "type" : "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2.json index c9b26960..e9150450 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2.json @@ -72,7 +72,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json index b1c5a9e4..98687e18 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json @@ -39,7 +39,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -48,7 +48,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - wrongly extended.json index accf02a6..e82e3cfe 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - wrongly extended.json @@ -59,7 +59,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference.json index 170d3c6a..74b651de 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference.json @@ -59,7 +59,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait.json index 6d03fca2..5967cb3a 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait.json @@ -70,7 +70,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index 2af6d0b6..5f99038c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -84,7 +84,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -243,7 +245,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -252,7 +254,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -376,7 +379,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -385,7 +388,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -509,7 +513,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -518,7 +522,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -656,7 +661,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -665,7 +670,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -828,7 +834,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -837,7 +843,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -961,7 +968,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -970,7 +977,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1094,7 +1102,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1103,7 +1111,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1241,7 +1250,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1250,7 +1259,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1392,7 +1402,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1401,7 +1411,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1525,7 +1536,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1534,7 +1545,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1658,7 +1670,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1667,7 +1679,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -1805,7 +1818,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -1814,7 +1827,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2160,7 +2174,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2169,7 +2183,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2293,7 +2308,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2302,7 +2317,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2426,7 +2442,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2435,7 +2451,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2573,7 +2590,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2582,7 +2599,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2745,7 +2763,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2754,7 +2772,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -2878,7 +2897,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -2887,7 +2906,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3011,7 +3031,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3020,7 +3040,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3158,7 +3179,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3167,7 +3188,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3309,7 +3331,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3318,7 +3340,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3442,7 +3465,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3451,7 +3474,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3575,7 +3599,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3584,7 +3608,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -3722,7 +3747,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -3731,7 +3756,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -4045,8 +4071,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4185,8 +4210,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4324,8 +4348,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4494,8 +4517,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4634,8 +4656,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4773,8 +4794,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -4989,7 +5009,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -4998,7 +5018,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5122,7 +5143,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5131,7 +5152,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5255,7 +5277,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5264,7 +5286,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5402,7 +5425,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5411,7 +5434,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5574,7 +5598,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5583,7 +5607,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5707,7 +5732,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5716,7 +5741,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5840,7 +5866,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5849,7 +5875,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -5987,7 +6014,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -5996,7 +6023,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6138,7 +6166,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6147,7 +6175,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6271,7 +6300,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6280,7 +6309,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6404,7 +6434,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6413,7 +6443,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6551,7 +6582,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -6560,7 +6591,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -6827,8 +6859,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -6967,8 +6998,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -7116,7 +7146,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7125,7 +7155,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7263,7 +7294,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7272,7 +7303,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7398,7 +7430,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7407,7 +7439,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", @@ -7509,7 +7542,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", @@ -7723,8 +7758,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -7843,7 +7877,7 @@ } }, "http" : { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.3.0", "headers" : { "type" : "object", "properties" : { @@ -7852,7 +7886,8 @@ "enum" : [ "application/json" ] } } - } + }, + "statusCode" : 200 }, "ibmmq" : { "bindingVersion" : "0.1.0", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json index acb016d5..55da0795 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json @@ -266,7 +266,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -415,7 +416,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -553,7 +555,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -704,7 +707,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -869,7 +873,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1018,7 +1023,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1156,7 +1162,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1307,7 +1314,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1450,7 +1458,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1599,7 +1608,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1737,7 +1747,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -1888,7 +1899,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2260,7 +2272,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2409,7 +2422,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2547,7 +2561,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2698,7 +2713,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -2863,7 +2879,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3012,7 +3029,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3150,7 +3168,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3301,7 +3320,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3444,7 +3464,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3593,7 +3614,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3731,7 +3753,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -3882,7 +3905,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -4206,7 +4230,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4222,7 +4245,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -4370,7 +4393,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4386,7 +4408,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -4533,7 +4555,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4549,7 +4570,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -4734,7 +4755,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4750,7 +4770,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -4898,7 +4918,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -4914,7 +4933,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -5061,7 +5080,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -5077,7 +5095,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -5324,7 +5342,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -5473,7 +5492,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -5611,7 +5631,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -5762,7 +5783,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -5927,7 +5949,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6076,7 +6099,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6214,7 +6238,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6365,7 +6390,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6508,7 +6534,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6657,7 +6684,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6795,7 +6823,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -6946,7 +6975,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -7217,7 +7247,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -7233,7 +7262,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -7380,7 +7409,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -7396,7 +7424,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -7562,7 +7590,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -7713,7 +7742,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -7851,7 +7881,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", @@ -8168,7 +8199,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -8184,7 +8214,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -8312,7 +8342,8 @@ } } }, - "bindingVersion": "0.1.0" + "statusCode" : 200, + "bindingVersion": "0.3.0" }, "ibmmq": { "type": "jms", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json index b71bfc14..6f57baf6 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json @@ -51,8 +51,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -191,8 +190,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -330,8 +328,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json index f084a322..ad4e3d96 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json @@ -59,7 +59,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -75,7 +74,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -223,7 +222,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -239,7 +237,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -386,7 +384,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -402,7 +399,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json index 0b58575d..c39fcd32 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json @@ -50,8 +50,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -190,8 +189,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", @@ -329,8 +327,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json index b7e9d0fb..d3a8274c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json @@ -58,7 +58,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -74,7 +73,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -222,7 +221,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -238,7 +236,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -385,7 +383,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -401,7 +398,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json index 52cc7196..9ce9700c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json @@ -58,7 +58,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -74,7 +73,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -222,7 +221,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -238,7 +236,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -385,7 +383,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -401,7 +398,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json index 1eb50625..1820ec38 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json @@ -59,7 +59,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -75,7 +74,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -223,7 +222,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -239,7 +237,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" @@ -386,7 +384,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -402,7 +399,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json index 0a70810e..a74c582e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json @@ -47,8 +47,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json index c9e7b2f4..cceee224 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json @@ -57,7 +57,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -73,7 +72,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json index d863472c..ad3d432c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json @@ -46,8 +46,7 @@ "$ref" : "#/components/operationBindings/googlepubsub" }, "http" : { - "bindingVersion" : "0.1.0", - "type" : "request", + "bindingVersion" : "0.3.0", "method" : "GET", "query" : { "type" : "object", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json index 36426512..1609576f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json @@ -56,7 +56,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -72,7 +71,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json index b5ba2703..fc121ef8 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json @@ -56,7 +56,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -72,7 +71,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json index 1e8b5ed2..59bdfa8d 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json @@ -57,7 +57,6 @@ "$ref": "#/components/operationBindings/googlepubsub" }, "http": { - "type": "request", "method": "GET", "query": { "type": "object", @@ -73,7 +72,7 @@ }, "additionalProperties": false }, - "bindingVersion": "0.1.0" + "bindingVersion": "0.3.0" }, "ibmmq": { "$ref": "#/components/operationBindings/ibmmq" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 2ea71b10..8b84a4cd 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -50,7 +50,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index d7066da6..9e30b383 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -53,7 +53,9 @@ "googlepubsub" : { "bindingVersion" : "0.2.0" }, - "http" : { }, + "http" : { + "bindingVersion" : "0.3.0" + }, "ibmmq" : { "bindingVersion" : "0.1.0", "groupId" : "PRODCLSTR1", From 3d888046952beaa63189f08a4d43c0e412dd61d5 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sat, 27 Apr 2024 18:02:14 +0400 Subject: [PATCH 045/141] tests(bindings): IBM MQ 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/171 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/ibmmq/IBMMQChannelBinding.java | 31 ++++++ .../bindings/ibmmq/IBMMQMessageBinding.java | 31 ++++++ .../bindings/ibmmq/IBMMQOperationBinding.java | 31 ++++++ .../bindings/ibmmq/IBMMQServerBinding.java | 32 ++++++ .../v0/_1_0/channel/IBMMQChannelBinding.java | 18 ++-- .../v0/_1_0/message/IBMMQMessageBinding.java | 19 ++-- .../_1_0/operation/IBMMQOperationBinding.java | 14 ++- .../v0/_1_0/server/IBMMQServerBinding.java | 18 ++-- .../com/asyncapi/bindings/ibmmq/IBMMQ.java | 11 +++ .../bindings/ibmmq/IBMMQLatestTest.java | 54 ++++++++++ .../ibmmq/IBMMQUnknownVersionTest.java | 54 ++++++++++ .../bindings/ibmmq/IBMMQV0_1_0Test.java | 98 +++++++++++++++++++ .../ibmmq/IBMMQWithoutVersionTest.java | 54 ++++++++++ .../_1_0/channel/IBMMQChannelBindingTest.kt | 35 ------- .../_1_0/message/IBMMQMessageBindingTest.kt | 24 ----- .../v0/_1_0/server/IBMMQServerBindingTest.kt | 26 ----- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../v3/_0_0/model/channel/ChannelTest.kt | 6 +- .../_0_0/model/channel/message/MessageTest.kt | 8 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../channel/binding - extended.json} | 0 .../channel/binding - wrongly extended.json} | 0 .../channel/binding.json} | 0 .../message/binding - extended.json} | 0 .../message/binding - wrongly extended.json} | 0 .../message/binding.json} | 0 .../0.1.0/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../ibmmq/0.1.0/operation/binding.json | 3 + .../server/binding - extended.json} | 0 .../server/binding - wrongly extended.json} | 0 .../server/binding.json} | 0 .../latest/channel/binding - extended.json | 21 ++++ .../channel/binding - wrongly extended.json | 22 +++++ .../ibmmq/latest/channel/binding.json | 16 +++ .../latest/message/binding - extended.json | 12 +++ .../message/binding - wrongly extended.json | 13 +++ .../ibmmq/latest/message/binding.json | 7 ++ .../latest/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../ibmmq/latest/operation/binding.json | 3 + .../latest/server/binding - extended.json | 13 +++ .../server/binding - wrongly extended.json | 14 +++ .../bindings/ibmmq/latest/server/binding.json | 8 ++ .../channel/binding - extended.json | 21 ++++ .../channel/binding - wrongly extended.json | 22 +++++ .../unknown version/channel/binding.json | 16 +++ .../message/binding - extended.json | 12 +++ .../message/binding - wrongly extended.json | 13 +++ .../unknown version/message/binding.json | 7 ++ .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../unknown version/operation/binding.json | 3 + .../server/binding - extended.json | 13 +++ .../server/binding - wrongly extended.json | 14 +++ .../ibmmq/unknown version/server/binding.json | 8 ++ .../channel/binding - extended.json | 21 ++++ .../channel/binding - wrongly extended.json | 22 +++++ .../without version/channel/binding.json | 16 +++ .../message/binding - extended.json | 12 +++ .../message/binding - wrongly extended.json | 13 +++ .../without version/message/binding.json | 7 ++ .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../without version/operation/binding.json | 3 + .../server/binding - extended.json | 13 +++ .../server/binding - wrongly extended.json | 14 +++ .../ibmmq/without version/server/binding.json | 8 ++ .../v2/2.0.0/model/asyncapi - extended.json | 24 +++-- .../model/channel/channelItem - extended.json | 16 ++- .../operation with message - extended.json | 8 +- ... with reference to message - extended.json | 8 +- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 8 +- 83 files changed, 975 insertions(+), 155 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQ.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt rename asyncapi-core/src/test/resources/bindings/ibmmq/{channel/ibmMQChannelBinding - extended.json => 0.1.0/channel/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/ibmmq/{channel/ibmMQChannelBinding - wrongly extended.json => 0.1.0/channel/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/ibmmq/{channel/ibmMQChannelBinding.json => 0.1.0/channel/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/ibmmq/{message/ibmMQMessageBinding - extended.json => 0.1.0/message/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/ibmmq/{message/ibmMQMessageBinding - wrongly extended.json => 0.1.0/message/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/ibmmq/{message/ibmMQMessageBinding.json => 0.1.0/message/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding.json rename asyncapi-core/src/test/resources/bindings/ibmmq/{server/ibmmqServerBinding - extended.json => 0.1.0/server/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/ibmmq/{server/ibmmqServerBinding - wrongly extended.json => 0.1.0/server/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/ibmmq/{server/ibmmqServerBinding.json => 0.1.0/server/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 8066517e..50a3d23c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -5,7 +5,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQChannelBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubChannelBinding; import com.asyncapi.bindings.http.HTTPChannelBinding; -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; +import com.asyncapi.bindings.ibmmq.IBMMQChannelBinding; import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 7c61eab9..e989f668 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -5,7 +5,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQMessageBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubMessageBinding; import com.asyncapi.bindings.http.HTTPMessageBinding; -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; +import com.asyncapi.bindings.ibmmq.IBMMQMessageBinding; import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 0f10a5b0..1c3c1309 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -5,7 +5,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQOperationBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubOperationBinding; import com.asyncapi.bindings.http.HTTPOperationBinding; -import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; +import com.asyncapi.bindings.ibmmq.IBMMQOperationBinding; import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 24d516d8..9dfd96ae 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -5,7 +5,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQServerBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubServerBinding; import com.asyncapi.bindings.http.HTTPServerBinding; -import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; +import com.asyncapi.bindings.ibmmq.IBMMQServerBinding; import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java new file mode 100644 index 00000000..40dbc2c7 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.ibmmq; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes IBM MQ channel binding. + *

+ * This object contains information about the channel representation in IBM MQ. Each channel corresponds to a Queue or Topic within IBM MQ. + * + * @version 0.1.0 + * @see IBM MQ channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class IBMMQChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java new file mode 100644 index 00000000..81a29d91 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.ibmmq; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes IBM MQ message binding. + *

+ * This object contains information about the message representation in IBM MQ. + * + * @version 0.1.0 + * @see IBM MQ message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class IBMMQMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java new file mode 100644 index 00000000..a6fd25f1 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.ibmmq; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes IBM MQ operation binding. + *

+ * This object MUST NOT contain any properties. Its name is reserved for future use. + * + * @version 0.1.0 + * @see IBM MQ operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class IBMMQOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java new file mode 100644 index 00000000..f840543d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.ibmmq; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes IBM MQ server binding. + *

+ * This object contains server connection information about the IBM MQ server, referred to as an IBM MQ queue manager. + * This object contains additional connectivity information not possible to represent within the core AsyncAPI specification. + * + * @version 0.1.0 + * @see IBM MQ server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class IBMMQServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java index ecfd1be3..0578168a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java @@ -22,7 +22,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes IBM MQ channel binding.") -public class IBMMQChannelBinding extends ChannelBinding { +public class IBMMQChannelBinding extends com.asyncapi.bindings.ibmmq.IBMMQChannelBinding { /** * Defines the type of AsyncAPI channel. @@ -77,12 +77,14 @@ public class IBMMQChannelBinding extends ChannelBinding { @JsonPropertyDescription("The maximum length of the physical message (in bytes) accepted by the Topic or Queue. Messages produced that are greater in size than this value may fail to be delivered. More information on the maximum message length can be found on this [page](https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.ref.dev.doc/q097520_.html) in the IBM MQ Knowledge Center.") private Integer maxMsgLength; - /** - * The version of this binding. - */ - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java index ee6730ef..89338f4a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java @@ -22,7 +22,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes IBM MQ message binding.") -public class IBMMQMessageBinding extends MessageBinding { +public class IBMMQMessageBinding extends com.asyncapi.bindings.ibmmq.IBMMQMessageBinding { /** * The type of the message. @@ -77,13 +77,14 @@ public class IBMMQMessageBinding extends MessageBinding { @JsonPropertyDescription("The recommended setting the client should use for the TTL (Time-To-Live) of the message. This is a period of time expressed in milliseconds and set by the application that puts the message. 'expiry' values are API dependant e.g., MQI and JMS use different units of time and default values for 'unlimited'. General information on IBM MQ message expiry can be found on this [page](https://www.ibm.com/docs/en/ibm-mq/9.2?topic=mqmd-expiry-mqlong) in the IBM MQ Knowledge Center.") private Integer expiry = 0; - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java index c72a96d4..9a6d25f9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * Describes IBM MQ operation binding. @@ -19,5 +20,16 @@ @Builder @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class IBMMQOperationBinding extends OperationBinding { +public class IBMMQOperationBinding extends com.asyncapi.bindings.ibmmq.IBMMQOperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java index c965fd4c..5c20fc38 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java @@ -23,7 +23,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes IBM MQ server binding.") -public class IBMMQServerBinding extends ServerBinding { +public class IBMMQServerBinding extends com.asyncapi.bindings.ibmmq.IBMMQServerBinding { /** * Defines a logical group of IBM MQ server objects. This is necessary to specify multi-endpoint configurations used @@ -91,12 +91,14 @@ public class IBMMQServerBinding extends ServerBinding { @JsonPropertyDescription("The recommended value (in seconds) for the heartbeat sent to the queue manager during periods of inactivity. A value of zero means that no heart beats are sent. A value of 1 means that the client will use the value defined by the queue manager.") private int heartBeatInterval = 300; - /** - * The version of this binding. - */ - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQ.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQ.java new file mode 100644 index 00000000..45a45946 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQ.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.ibmmq; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("IBM MQ") +@SelectPackages("com.asyncapi.bindings.ibmmq") +public class IBMMQ { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQLatestTest.java new file mode 100644 index 00000000..7af44264 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.ibmmq; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class IBMMQLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.channelBinding(); + super.bindingTypeClass = IBMMQChannelBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.messageBinding(); + super.bindingTypeClass = IBMMQMessageBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.operationBinding(); + super.bindingTypeClass = IBMMQOperationBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.serverBinding(); + super.bindingTypeClass = IBMMQServerBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQUnknownVersionTest.java new file mode 100644 index 00000000..e6d90d46 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.ibmmq; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class IBMMQUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.channelBinding(); + super.bindingTypeClass = IBMMQChannelBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.messageBinding(); + super.bindingTypeClass = IBMMQMessageBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.operationBinding(); + super.bindingTypeClass = IBMMQOperationBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.serverBinding(); + super.bindingTypeClass = IBMMQServerBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQV0_1_0Test.java new file mode 100644 index 00000000..ceb55a48 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQV0_1_0Test.java @@ -0,0 +1,98 @@ +package com.asyncapi.bindings.ibmmq; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelDestinationType; +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelQueueProperties; +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelTopicProperties; +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageType; +import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class IBMMQV0_1_0Test { + + public static IBMMQChannelBinding channelBinding () { + return IBMMQChannelBinding.builder() + .destinationType(IBMMQChannelDestinationType.TOPIC) + .queue(IBMMQChannelQueueProperties.builder() + .objectName("message") + .isPartitioned(false) + .exclusive(true) + .build() + ) + .topic(IBMMQChannelTopicProperties.builder() + .string("messages") + .objectName("message") + .durablePermitted(true) + .lastMsgRetained(true) + .build() + ) + .maxMsgLength(1024) + .build(); + } + + public static IBMMQMessageBinding messageBinding () { + return IBMMQMessageBinding.builder() + .type(IBMMQMessageType.JMS) + .description("JMS stream message") + .headers("Content-Type: application/json") + .expiry(0) + .build(); + } + + public static IBMMQOperationBinding operationBinding () { + return new IBMMQOperationBinding(); + } + + public static IBMMQServerBinding serverBinding () { + return IBMMQServerBinding.builder() + .groupId("PRODCLSTR1") + .cipherSpec("ANY_TLS12_OR_HIGHER") + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = IBMMQChannelBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = IBMMQMessageBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = IBMMQOperationBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = IBMMQServerBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQWithoutVersionTest.java new file mode 100644 index 00000000..aa20ca27 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/IBMMQWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.ibmmq; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding; +import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class IBMMQWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.channelBinding(); + super.bindingTypeClass = IBMMQChannelBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.messageBinding(); + super.bindingTypeClass = IBMMQMessageBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.operationBinding(); + super.bindingTypeClass = IBMMQOperationBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = IBMMQV0_1_0Test.serverBinding(); + super.bindingTypeClass = IBMMQServerBinding.class; + super.pathToBindingJson = "/bindings/ibmmq/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/ibmmq/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/ibmmq/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt deleted file mode 100644 index 87cc443e..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBindingTest.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.asyncapi.bindings.ibmmq.v0._1_0.channel - -import com.asyncapi.v3.SerDeTest - -class IBMMQChannelBindingTest: SerDeTest() { - - override fun objectClass() = IBMMQChannelBinding::class.java - - override fun baseObjectJson() = "/bindings/ibmmq/channel/ibmMQChannelBinding.json" - - override fun extendedObjectJson() = "/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/ibmmq/channel/ibmMQChannelBinding - wrongly extended.json" - - override fun build(): IBMMQChannelBinding { - return IBMMQChannelBinding.builder() - .destinationType(IBMMQChannelDestinationType.TOPIC) - .queue(IBMMQChannelQueueProperties.builder() - .objectName("message") - .isPartitioned(false) - .exclusive(true) - .build() - ) - .topic(IBMMQChannelTopicProperties.builder() - .string("messages") - .objectName("message") - .durablePermitted(true) - .lastMsgRetained(true) - .build() - ) - .maxMsgLength(1024) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt deleted file mode 100644 index 54356285..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBindingTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.asyncapi.bindings.ibmmq.v0._1_0.message - -import com.asyncapi.v3.SerDeTest - -class IBMMQMessageBindingTest: SerDeTest() { - - override fun objectClass() = IBMMQMessageBinding::class.java - - override fun baseObjectJson() = "/bindings/ibmmq/message/ibmMQMessageBinding.json" - - override fun extendedObjectJson() = "/bindings/ibmmq/message/ibmMQMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/ibmmq/message/ibmMQMessageBinding - wrongly extended.json" - - override fun build(): IBMMQMessageBinding { - return IBMMQMessageBinding.builder() - .type(IBMMQMessageType.JMS) - .description("JMS stream message") - .headers("Content-Type: application/json") - .expiry(0) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt deleted file mode 100644 index b5fb9f5f..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBindingTest.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.asyncapi.bindings.ibmmq.v0._1_0.server - -import com.asyncapi.v3.SerDeTest - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class IBMMQServerBindingTest: SerDeTest() { - - override fun objectClass() = IBMMQServerBinding::class.java - - override fun baseObjectJson() = "/bindings/ibmmq/server/ibmmqServerBinding.json" - - override fun extendedObjectJson() = "/bindings/ibmmq/server/ibmmqServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/ibmmq/server/ibmmqServerBinding - wrongly extended.json" - - override fun build(): IBMMQServerBinding { - return IBMMQServerBinding.builder() - .groupId("PRODCLSTR1") - .cipherSpec("ANY_TLS12_OR_HIGHER") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index e8327302..ebff2932 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest +import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding @@ -60,7 +60,7 @@ class ChannelItemTest: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", HTTPV0_3_0Test.channelBinding()), - Pair("ibmmq", IBMMQChannelBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", JMSChannelBinding()), Pair("kafka", KafkaChannelBindingTest().build()), Pair("mercure", MercureChannelBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 0281c9df..34b9b699 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding @@ -119,7 +119,7 @@ class MessageTest: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", JMSMessageBinding()), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", MercureMessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index cbb673f3..81ae33c2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding @@ -78,7 +78,7 @@ class MessageTraitTest: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", JMSMessageBinding()), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", MercureMessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 93b3cbf8..41ad0112 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest +import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider @@ -49,7 +49,7 @@ class ChannelItemTest: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", Reference("#/components/channelBindings/http")), - Pair("ibmmq", IBMMQChannelBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", Reference("#/components/channelBindings/jms")), Pair("kafka", KafkaChannelBindingTest().build()), Pair("mercure", Reference("#/components/channelBindings/mercure")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index 4984291d..1c760029 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest @@ -93,7 +93,7 @@ class MessageTest: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", Reference("#/components/messageBindings/mercure")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index b0088816..f74b63a6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest @@ -65,7 +65,7 @@ class MessageTraitTest: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", Reference("#/components/messageBindings/mercure")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index c7967c75..ebff0c15 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.v3._0_0.model.channel.message.MessageTestWithSchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test -import com.asyncapi.bindings.ibmmq.v0._1_0.channel.IBMMQChannelBindingTest +import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider @@ -69,7 +69,7 @@ class ChannelTest: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", Reference("#/components/channelBindings/http")), - Pair("ibmmq", IBMMQChannelBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", Reference("#/components/channelBindings/jms")), Pair("kafka", KafkaChannelBindingTest().build()), Pair("mercure", Reference("#/components/channelBindings/mercure")), @@ -142,7 +142,7 @@ class ChannelTestWithReference: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", Reference("#/components/channelBindings/http")), - Pair("ibmmq", IBMMQChannelBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", Reference("#/components/channelBindings/jms")), Pair("kafka", KafkaChannelBindingTest().build()), Pair("mercure", Reference("#/components/channelBindings/mercure")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 58952e88..d6aa3717 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.v3.schema.AsyncAPISchema @@ -89,7 +89,7 @@ class MessageTestWithSchema: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", Reference("#/components/messageBindings/mercure")), @@ -142,7 +142,7 @@ class MessageTestWithReference: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", @@ -232,7 +232,7 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 178d2738..b8238d03 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.ibmmq.v0._1_0.message.IBMMQMessageBindingTest +import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema @@ -64,7 +64,7 @@ class MessageTraitTestWithSchema: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", @@ -119,7 +119,7 @@ class MessageTraitTestWithReference: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", @@ -191,7 +191,7 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), - Pair("ibmmq", IBMMQMessageBindingTest().build()), + Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaMessageBindingTest().build()), Pair("mercure", diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/ibmmq/channel/ibmMQChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/ibmmq/message/ibmMQMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/ibmmq/server/ibmmqServerBinding.json rename to asyncapi-core/src/test/resources/bindings/ibmmq/0.1.0/server/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding - extended.json new file mode 100644 index 00000000..f3e6ae31 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.1.0", + "destinationType" : "topic", + "queue" : { + "objectName" : "message", + "isPartitioned" : false, + "exclusive" : true + }, + "topic" : { + "string" : "messages", + "objectName" : "message", + "durablePermitted" : true, + "lastMsgRetained" : true + }, + "maxMsgLength" : 1024, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..130861da --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "destinationType": "topic", + "queue": { + "objectName": "message", + "isPartitioned": false, + "exclusive": true + }, + "topic": { + "string": "messages", + "objectName": "message", + "durablePermitted": true, + "lastMsgRetained": true + }, + "maxMsgLength": 1024, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding.json new file mode 100644 index 00000000..e1c8cc11 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/channel/binding.json @@ -0,0 +1,16 @@ +{ + "destinationType": "topic", + "queue": { + "objectName": "message", + "isPartitioned": false, + "exclusive": true + }, + "topic": { + "string": "messages", + "objectName": "message", + "durablePermitted": true, + "lastMsgRetained": true + }, + "maxMsgLength": 1024, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding - extended.json new file mode 100644 index 00000000..ff8bc475 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding - extended.json @@ -0,0 +1,12 @@ +{ + "bindingVersion" : "0.1.0", + "type" : "jms", + "headers" : "Content-Type: application/json", + "description" : "JMS stream message", + "expiry" : 0, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..1574a122 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding - wrongly extended.json @@ -0,0 +1,13 @@ +{ + "type": "jms", + "description": "JMS stream message", + "headers": "Content-Type: application/json", + "expiry": 0, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding.json new file mode 100644 index 00000000..3a349df2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/message/binding.json @@ -0,0 +1,7 @@ +{ + "type": "jms", + "description": "JMS stream message", + "headers": "Content-Type: application/json", + "expiry": 0, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding - extended.json new file mode 100644 index 00000000..ef2ad7e5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding - extended.json @@ -0,0 +1,13 @@ +{ + "bindingVersion" : "0.1.0", + "groupId" : "PRODCLSTR1", + "ccdtQueueManagerName" : "*", + "cipherSpec" : "ANY_TLS12_OR_HIGHER", + "multiEndpointServer" : false, + "heartBeatInterval" : 300, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..2afb5e18 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding - wrongly extended.json @@ -0,0 +1,14 @@ +{ + "groupId": "PRODCLSTR1", + "ccdtQueueManagerName": "*", + "multiEndpointServer": false, + "heartBeatInterval": 300, + "cipherSpec": "ANY_TLS12_OR_HIGHER", + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding.json new file mode 100644 index 00000000..85141cce --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/latest/server/binding.json @@ -0,0 +1,8 @@ +{ + "groupId": "PRODCLSTR1", + "ccdtQueueManagerName": "*", + "multiEndpointServer": false, + "heartBeatInterval": 300, + "cipherSpec": "ANY_TLS12_OR_HIGHER", + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..f3e6ae31 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.1.0", + "destinationType" : "topic", + "queue" : { + "objectName" : "message", + "isPartitioned" : false, + "exclusive" : true + }, + "topic" : { + "string" : "messages", + "objectName" : "message", + "durablePermitted" : true, + "lastMsgRetained" : true + }, + "maxMsgLength" : 1024, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..bcb60484 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "destinationType": "topic", + "queue": { + "objectName": "message", + "isPartitioned": false, + "exclusive": true + }, + "topic": { + "string": "messages", + "objectName": "message", + "durablePermitted": true, + "lastMsgRetained": true + }, + "maxMsgLength": 1024, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding.json new file mode 100644 index 00000000..fc691575 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/channel/binding.json @@ -0,0 +1,16 @@ +{ + "destinationType": "topic", + "queue": { + "objectName": "message", + "isPartitioned": false, + "exclusive": true + }, + "topic": { + "string": "messages", + "objectName": "message", + "durablePermitted": true, + "lastMsgRetained": true + }, + "maxMsgLength": 1024, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding - extended.json new file mode 100644 index 00000000..ff8bc475 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding - extended.json @@ -0,0 +1,12 @@ +{ + "bindingVersion" : "0.1.0", + "type" : "jms", + "headers" : "Content-Type: application/json", + "description" : "JMS stream message", + "expiry" : 0, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..7c8d3491 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,13 @@ +{ + "type": "jms", + "description": "JMS stream message", + "headers": "Content-Type: application/json", + "expiry": 0, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding.json new file mode 100644 index 00000000..8d85dd78 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/message/binding.json @@ -0,0 +1,7 @@ +{ + "type": "jms", + "description": "JMS stream message", + "headers": "Content-Type: application/json", + "expiry": 0, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding - extended.json new file mode 100644 index 00000000..ef2ad7e5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding - extended.json @@ -0,0 +1,13 @@ +{ + "bindingVersion" : "0.1.0", + "groupId" : "PRODCLSTR1", + "ccdtQueueManagerName" : "*", + "cipherSpec" : "ANY_TLS12_OR_HIGHER", + "multiEndpointServer" : false, + "heartBeatInterval" : 300, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..f5b67bfa --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,14 @@ +{ + "groupId": "PRODCLSTR1", + "ccdtQueueManagerName": "*", + "multiEndpointServer": false, + "heartBeatInterval": 300, + "cipherSpec": "ANY_TLS12_OR_HIGHER", + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding.json new file mode 100644 index 00000000..fe58c091 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/unknown version/server/binding.json @@ -0,0 +1,8 @@ +{ + "groupId": "PRODCLSTR1", + "ccdtQueueManagerName": "*", + "multiEndpointServer": false, + "heartBeatInterval": 300, + "cipherSpec": "ANY_TLS12_OR_HIGHER", + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - extended.json new file mode 100644 index 00000000..f3e6ae31 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.1.0", + "destinationType" : "topic", + "queue" : { + "objectName" : "message", + "isPartitioned" : false, + "exclusive" : true + }, + "topic" : { + "string" : "messages", + "objectName" : "message", + "durablePermitted" : true, + "lastMsgRetained" : true + }, + "maxMsgLength" : 1024, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..fbf1e1c5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "destinationType": "topic", + "queue": { + "objectName": "message", + "isPartitioned": false, + "exclusive": true + }, + "topic": { + "string": "messages", + "objectName": "message", + "durablePermitted": true, + "lastMsgRetained": true + }, + "maxMsgLength": 1024, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding.json new file mode 100644 index 00000000..ff4c3ce0 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding.json @@ -0,0 +1,16 @@ +{ + "destinationType": "topic", + "queue": { + "objectName": "message", + "isPartitioned": false, + "exclusive": true + }, + "topic": { + "string": "messages", + "objectName": "message", + "durablePermitted": true, + "lastMsgRetained": true + }, + "maxMsgLength": 1024, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - extended.json new file mode 100644 index 00000000..ff8bc475 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - extended.json @@ -0,0 +1,12 @@ +{ + "bindingVersion" : "0.1.0", + "type" : "jms", + "headers" : "Content-Type: application/json", + "description" : "JMS stream message", + "expiry" : 0, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..2029f4ba --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - wrongly extended.json @@ -0,0 +1,13 @@ +{ + "type": "jms", + "description": "JMS stream message", + "headers": "Content-Type: application/json", + "expiry": 0, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding.json new file mode 100644 index 00000000..c57f07b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding.json @@ -0,0 +1,7 @@ +{ + "type": "jms", + "description": "JMS stream message", + "headers": "Content-Type: application/json", + "expiry": 0, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - extended.json new file mode 100644 index 00000000..ef2ad7e5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - extended.json @@ -0,0 +1,13 @@ +{ + "bindingVersion" : "0.1.0", + "groupId" : "PRODCLSTR1", + "ccdtQueueManagerName" : "*", + "cipherSpec" : "ANY_TLS12_OR_HIGHER", + "multiEndpointServer" : false, + "heartBeatInterval" : 300, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..aa92ec23 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - wrongly extended.json @@ -0,0 +1,14 @@ +{ + "groupId": "PRODCLSTR1", + "ccdtQueueManagerName": "*", + "multiEndpointServer": false, + "heartBeatInterval": 300, + "cipherSpec": "ANY_TLS12_OR_HIGHER", + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding.json new file mode 100644 index 00000000..155437bd --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding.json @@ -0,0 +1,8 @@ +{ + "groupId": "PRODCLSTR1", + "ccdtQueueManagerName": "*", + "multiEndpointServer": false, + "heartBeatInterval": 300, + "cipherSpec": "ANY_TLS12_OR_HIGHER", + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 0c78a705..ee7fb107 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -161,7 +161,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -279,7 +281,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -400,7 +404,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -518,7 +524,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -1200,7 +1208,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -1619,7 +1629,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index cdf89275..0234925e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -55,7 +55,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -173,7 +175,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -294,7 +298,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -412,7 +418,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index a17fc37f..3bbef16a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -53,7 +53,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -171,7 +173,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index d057ad7b..fe6224be 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -53,7 +53,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -171,7 +173,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 82f865dd..5d34607b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -53,7 +53,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 31549965..2e89b083 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -342,7 +342,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", @@ -761,7 +763,9 @@ "additionalProperties" : false } }, - "ibmmq" : { }, + "ibmmq" : { + "bindingVersion" : "0.1.0" + }, "jms" : { }, "kafka" : { "bindingVersion" : "0.4.0", From 86a258e0cf0209f73d11533c94af4434e9b1c7c1 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sat, 27 Apr 2024 20:14:16 +0400 Subject: [PATCH 046/141] tests(bindings): JMS 0.0.1 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/172 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/jms/JMSChannelBinding.java | 31 ++++ .../bindings/jms/JMSMessageBinding.java | 31 ++++ .../bindings/jms/JMSOperationBinding.java | 31 ++++ .../bindings/jms/JMSServerBinding.java | 31 ++++ .../v0/_0_1/channel/JMSChannelBinding.java | 38 ++++- .../channel/JMSChannelDestinationType.java | 13 ++ .../v0/_0_1/message/JMSMessageBinding.java | 34 ++++- .../_0_1/operation/JMSOperationBinding.java | 15 +- .../jms/v0/_0_1/server/JMSServerBinding.java | 50 ++++++- .../jms/v0/_0_1/server/JMSServerProperty.java | 33 +++++ .../kotlin/com/asyncapi/bindings/jms/JMS.java | 11 ++ .../asyncapi/bindings/jms/JMSLatestTest.java | 54 +++++++ .../bindings/jms/JMSUnknownVersionTest.java | 54 +++++++ .../asyncapi/bindings/jms/JMSV0_1_0Test.java | 136 ++++++++++++++++++ .../bindings/jms/JMSWithoutVersionTest.java | 54 +++++++ .../jms/0.0.1/channel/binding - extended.json | 10 ++ .../channel/binding - wrongly extended.json | 11 ++ .../bindings/jms/0.0.1/channel/binding.json | 5 + .../jms/0.0.1/message/binding - extended.json | 49 +++++++ .../message/binding - wrongly extended.json | 50 +++++++ .../bindings/jms/0.0.1/message/binding.json | 44 ++++++ .../0.0.1/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../bindings/jms/0.0.1/operation/binding.json | 3 + .../jms/0.0.1/server/binding - extended.json | 14 ++ .../server/binding - wrongly extended.json | 17 +++ .../bindings/jms/0.0.1/server/binding.json | 11 ++ .../latest/channel/binding - extended.json | 10 ++ .../channel/binding - wrongly extended.json | 11 ++ .../bindings/jms/latest/channel/binding.json | 5 + .../latest/message/binding - extended.json | 49 +++++++ .../message/binding - wrongly extended.json | 50 +++++++ .../bindings/jms/latest/message/binding.json | 44 ++++++ .../latest/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../jms/latest/operation/binding.json | 3 + .../jms/latest/server/binding - extended.json | 14 ++ .../server/binding - wrongly extended.json | 17 +++ .../bindings/jms/latest/server/binding.json | 11 ++ .../channel/binding - extended.json | 10 ++ .../channel/binding - wrongly extended.json | 11 ++ .../jms/unknown version/channel/binding.json | 5 + .../message/binding - extended.json | 49 +++++++ .../message/binding - wrongly extended.json | 50 +++++++ .../jms/unknown version/message/binding.json | 44 ++++++ .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../unknown version/operation/binding.json | 3 + .../server/binding - extended.json | 14 ++ .../server/binding - wrongly extended.json | 17 +++ .../jms/unknown version/server/binding.json | 11 ++ .../channel/binding - extended.json | 10 ++ .../channel/binding - wrongly extended.json | 11 ++ .../jms/without version/channel/binding.json | 5 + .../message/binding - extended.json | 49 +++++++ .../message/binding - wrongly extended.json | 50 +++++++ .../jms/without version/message/binding.json | 44 ++++++ .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../without version/operation/binding.json | 3 + .../server/binding - extended.json | 14 ++ .../server/binding - wrongly extended.json | 17 +++ .../jms/without version/server/binding.json | 11 ++ .../v2/2.0.0/model/asyncapi - extended.json | 58 ++++++-- .../model/channel/channelItem - extended.json | 24 +++- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 12 +- ... with reference to message - extended.json | 8 +- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 29 +++- .../2.0.0/model/server/server - extended.json | 5 +- .../v2/2.6.0/model/asyncapi - extended.json | 15 +- .../components/components - extended.json | 10 +- .../2.6.0/model/server/server - extended.json | 5 +- .../v3/3.0.0/model/asyncapi - extended.json | 20 ++- .../components/components - extended.json | 10 +- .../3.0.0/model/server/server - extended.json | 5 +- .../server with reference - extended.json | 5 +- 83 files changed, 1695 insertions(+), 71 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelDestinationType.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerProperty.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMS.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSWithoutVersionTest.java create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/jms/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 50a3d23c..dad29d1f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubChannelBinding; import com.asyncapi.bindings.http.HTTPChannelBinding; import com.asyncapi.bindings.ibmmq.IBMMQChannelBinding; -import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; +import com.asyncapi.bindings.jms.JMSChannelBinding; import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index e989f668..9a20b7ab 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubMessageBinding; import com.asyncapi.bindings.http.HTTPMessageBinding; import com.asyncapi.bindings.ibmmq.IBMMQMessageBinding; -import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; +import com.asyncapi.bindings.jms.JMSMessageBinding; import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 1c3c1309..a2cab77b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubOperationBinding; import com.asyncapi.bindings.http.HTTPOperationBinding; import com.asyncapi.bindings.ibmmq.IBMMQOperationBinding; -import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; +import com.asyncapi.bindings.jms.JMSOperationBinding; import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 9dfd96ae..d259171d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubServerBinding; import com.asyncapi.bindings.http.HTTPServerBinding; import com.asyncapi.bindings.ibmmq.IBMMQServerBinding; -import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; +import com.asyncapi.bindings.jms.JMSServerBinding; import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java new file mode 100644 index 00000000..6ecfe726 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.jms; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes JMS channel binding. + * + * @version 0.1.0 + * @see JMS channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding.class, names = { + "0.0.1", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class JMSChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java new file mode 100644 index 00000000..b0b098f2 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.jms; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes JMS message binding. + * + * @version 0.1.0 + * @see JMS message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding.class, names = { + "0.0.1", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class JMSMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java new file mode 100644 index 00000000..4581e184 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.jms; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes JMS operation binding. + * + * @version 0.1.0 + * @see JMS operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding.class, names = { + "0.0.1", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class JMSOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java new file mode 100644 index 00000000..3fb59c6b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.jms; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes JMS server binding. + * + * @version 0.1.0 + * @see JMS server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding.class, names = { + "0.0.1", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class JMSServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java index 44b84837..ded15e31 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java @@ -1,9 +1,8 @@ package com.asyncapi.bindings.jms.v0._0_1.channel; -import com.asyncapi.bindings.ChannelBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -15,7 +14,36 @@ * @author Pavel Bodiachevskii */ @Data +@Builder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class JMSChannelBinding extends ChannelBinding { +public class JMSChannelBinding extends com.asyncapi.bindings.jms.JMSChannelBinding { + + /** + * The destination (queue) name for this channel. + *

+ * SHOULD only be specified if the channel name differs from the actual destination name, + * such as when the channel name is not a valid destination name according to the JMS Provider. + *

+ * Defaults to the channel name. + */ + @Nullable + @JsonProperty("destination") + private String destination; + + @Nullable + @JsonProperty("destinationType") + private JMSChannelDestinationType destinationType; + + @Override + public String getBindingVersion() { + return "0.0.1"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.0.1"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelDestinationType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelDestinationType.java new file mode 100644 index 00000000..670ae721 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelDestinationType.java @@ -0,0 +1,13 @@ +package com.asyncapi.bindings.jms.v0._0_1.channel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public enum JMSChannelDestinationType { + + @JsonProperty("queue") + QUEUE, + + @JsonProperty("fifo-queue") + FIFO_QUEUE + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java index 68a27cf8..c9b55651 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.jms.v0._0_1.message; -import com.asyncapi.bindings.MessageBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -15,7 +15,31 @@ * @author Pavel Bodiachevskii */ @Data +@Builder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class JMSMessageBinding extends MessageBinding { +public class JMSMessageBinding extends com.asyncapi.bindings.jms.JMSMessageBinding { + + /** + * A Schema object containing the definitions for JMS headers (protocol headers). + *

+ * This schema MUST be of type 'object' and have a 'properties' key. + *

+ * Examples of JMS protocol headers are 'JMSMessageID', 'JMSTimestamp', and 'JMSCorrelationID'. + */ + @Nullable + @JsonProperty("headers") + public AsyncAPISchema headers; + + @Override + public String getBindingVersion() { + return "0.0.1"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.0.1"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java index 42242e3e..024065f3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.jms.v0._0_1.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class JMSOperationBinding extends OperationBinding { +public class JMSOperationBinding extends com.asyncapi.bindings.jms.JMSOperationBinding { + + @Override + public String getBindingVersion() { + return "0.0.1"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.0.1"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java index 5adbb792..9882dbb2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java @@ -1,9 +1,11 @@ package com.asyncapi.bindings.jms.v0._0_1.server; -import com.asyncapi.bindings.ServerBinding; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -15,7 +17,45 @@ * @author Pavel Bodiachevskii */ @Data +@Builder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class JMSServerBinding extends ServerBinding { +public class JMSServerBinding extends com.asyncapi.bindings.jms.JMSServerBinding { + + /** + * The classname of the ConnectionFactory implementation for the JMS Provider. + */ + @NotNull + @JsonProperty("jmsConnectionFactory") + private String jmsConnectionFactory = ""; + + /** + * Additional properties to set on the JMS ConnectionFactory implementation for the JMS Provider. + */ + @Nullable + @JsonProperty("properties") + private List<@NotNull JMSServerProperty> properties; + + /** + * A client identifier for applications that use this JMS connection factory. + *

+ * If the Client ID Policy is set to 'Restricted' (the default), + * then configuring a Client ID on the ConnectionFactory prevents more than one JMS client from + * using a connection from this factory. + */ + @Nullable + @JsonProperty("clientID") + private String clientID; + + @Override + public String getBindingVersion() { + return "0.0.1"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.0.1"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerProperty.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerProperty.java new file mode 100644 index 00000000..fd0a6180 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerProperty.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.jms.v0._0_1.server; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class JMSServerProperty { + + /** + * The name of a property + */ + @NotNull + private String name; + + /** + * The value of a property + * + * MUST BE: + *

    + *
  • string
    • + *
  • boolean
    • + *
  • number
    • + *
  • null
    • + *
+ */ + @NotNull + private Object value; + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMS.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMS.java new file mode 100644 index 00000000..df097ba2 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMS.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.jms; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("JMS") +@SelectPackages("com.asyncapi.bindings.jms") +public class JMS { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSLatestTest.java new file mode 100644 index 00000000..57cf136a --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.jms; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; +import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; +import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class JMSLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = JMSV0_1_0Test.channelBinding(); + super.bindingTypeClass = JMSChannelBinding.class; + super.pathToBindingJson = "/bindings/jms/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = JMSV0_1_0Test.messageBinding(); + super.bindingTypeClass = JMSMessageBinding.class; + super.pathToBindingJson = "/bindings/jms/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = JMSV0_1_0Test.operationBinding(); + super.bindingTypeClass = JMSOperationBinding.class; + super.pathToBindingJson = "/bindings/jms/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = JMSV0_1_0Test.serverBinding(); + super.bindingTypeClass = JMSServerBinding.class; + super.pathToBindingJson = "/bindings/jms/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSUnknownVersionTest.java new file mode 100644 index 00000000..4e422365 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.jms; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; +import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; +import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class JMSUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = JMSV0_1_0Test.channelBinding(); + super.bindingTypeClass = JMSChannelBinding.class; + super.pathToBindingJson = "/bindings/jms/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = JMSV0_1_0Test.messageBinding(); + super.bindingTypeClass = JMSMessageBinding.class; + super.pathToBindingJson = "/bindings/jms/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = JMSV0_1_0Test.operationBinding(); + super.bindingTypeClass = JMSOperationBinding.class; + super.pathToBindingJson = "/bindings/jms/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = JMSV0_1_0Test.serverBinding(); + super.bindingTypeClass = JMSServerBinding.class; + super.pathToBindingJson = "/bindings/jms/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java new file mode 100644 index 00000000..257c52f5 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java @@ -0,0 +1,136 @@ +package com.asyncapi.bindings.jms; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; +import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelDestinationType; +import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; +import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerProperty; +import com.asyncapi.v3.schema.AsyncAPISchema; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +@DisplayName("0.0.1") +public class JMSV0_1_0Test { + + public static JMSChannelBinding channelBinding () { + return JMSChannelBinding.builder() + .destination("user-signed-up") + .destinationType(JMSChannelDestinationType.FIFO_QUEUE) + .build(); + } + + public static JMSMessageBinding messageBinding () { + var properties = new LinkedHashMap(); + properties.put("JMSMessageID", AsyncAPISchema.builder() + .type(List.of("string", "null")) + .description("A unique message identifier. This may be set by your JMS Provider on your behalf.") + .build() + ); + properties.put("JMSTimestamp", AsyncAPISchema.builder() + .type("integer") + .description("The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC.") + .build() + ); + properties.put("JMSDeliveryMode", AsyncAPISchema.builder() + .type("string") + .enumValue(List.of("PERSISTENT", "NON_PERSISTENT")) + .defaultValue("PERSISTENT") + .description("Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf.") + .build() + ); + properties.put("JMSPriority", AsyncAPISchema.builder() + .type("integer") + .defaultValue(4) + .description("The priority of the message. This may be set by your JMS Provider on your behalf.") + .build() + ); + properties.put("JMSExpires", AsyncAPISchema.builder() + .type("integer") + .description("The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire.") + .build() + ); + properties.put("JMSType", AsyncAPISchema.builder() + .type(List.of("string", "null")) + .description("The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it.") + .build() + ); + properties.put("JMSCorrelationID", AsyncAPISchema.builder() + .type(List.of("string", "null")) + .description("The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values.") + .build() + ); + properties.put("JMSReplyTo", AsyncAPISchema.builder() + .type("string") + .description("The queue or topic that the message sender expects replies to.") + .build() + ); + + return JMSMessageBinding.builder() + .headers(AsyncAPISchema.builder() + .type("object") + .required(List.of("JMSMessageID")) + .properties(properties) + .build() + ) + .build(); + } + + public static JMSOperationBinding operationBinding () { + return new JMSOperationBinding(); + } + + public static JMSServerBinding serverBinding () { + return JMSServerBinding.builder() + .jmsConnectionFactory("org.apache.activemq.ActiveMQConnectionFactory") + .clientID("my-application-1") + .properties(List.of(new JMSServerProperty("disableTimeStampsByDefault", false))) + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = JMSChannelBinding.class; + super.pathToBindingJson = "/bindings/jms/0.0.1/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/0.0.1/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/0.0.1/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = JMSMessageBinding.class; + super.pathToBindingJson = "/bindings/jms/0.0.1/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/0.0.1/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/0.0.1/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = JMSOperationBinding.class; + super.pathToBindingJson = "/bindings/jms/0.0.1/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/0.0.1/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/0.0.1/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = JMSServerBinding.class; + super.pathToBindingJson = "/bindings/jms/0.0.1/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/0.0.1/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/0.0.1/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSWithoutVersionTest.java new file mode 100644 index 00000000..c4779a3e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.jms; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding; +import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding; +import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; +import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class JMSWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = JMSV0_1_0Test.channelBinding(); + super.bindingTypeClass = JMSChannelBinding.class; + super.pathToBindingJson = "/bindings/jms/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = JMSV0_1_0Test.messageBinding(); + super.bindingTypeClass = JMSMessageBinding.class; + super.pathToBindingJson = "/bindings/jms/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = JMSV0_1_0Test.operationBinding(); + super.bindingTypeClass = JMSOperationBinding.class; + super.pathToBindingJson = "/bindings/jms/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = JMSV0_1_0Test.serverBinding(); + super.bindingTypeClass = JMSServerBinding.class; + super.pathToBindingJson = "/bindings/jms/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/jms/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/jms/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding - extended.json new file mode 100644 index 00000000..998357b8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.0.1", + "destination" : "user-signed-up", + "destinationType" : "fifo-queue", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding - wrongly extended.json new file mode 100644 index 00000000..ca744da4 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "destination": "user-signed-up", + "destinationType": "fifo-queue", + "bindingVersion": "0.0.1", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding.json new file mode 100644 index 00000000..a9e0632a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/channel/binding.json @@ -0,0 +1,5 @@ +{ + "destination": "user-signed-up", + "destinationType": "fifo-queue", + "bindingVersion": "0.0.1" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding - extended.json new file mode 100644 index 00000000..5fb29ddb --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding - extended.json @@ -0,0 +1,49 @@ +{ + "bindingVersion" : "0.0.1", + "headers" : { + "type" : "object", + "required" : [ "JMSMessageID" ], + "properties" : { + "JMSMessageID" : { + "type" : [ "string", "null" ], + "description" : "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp" : { + "type" : "integer", + "description" : "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode" : { + "type" : "string", + "enum" : [ "PERSISTENT", "NON_PERSISTENT" ], + "description" : "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf.", + "default" : "PERSISTENT" + }, + "JMSPriority" : { + "type" : "integer", + "description" : "The priority of the message. This may be set by your JMS Provider on your behalf.", + "default" : 4 + }, + "JMSExpires" : { + "type" : "integer", + "description" : "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType" : { + "type" : [ "string", "null" ], + "description" : "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID" : { + "type" : [ "string", "null" ], + "description" : "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo" : { + "type" : "string", + "description" : "The queue or topic that the message sender expects replies to." + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding - wrongly extended.json new file mode 100644 index 00000000..305c86d1 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding - wrongly extended.json @@ -0,0 +1,50 @@ +{ + "headers": { + "type": "object", + "required": ["JMSMessageID"], + "properties": { + "JMSMessageID": { + "type": ["string", "null"], + "description": "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp": { + "type": "integer", + "description": "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode": { + "type": "string", + "enum": ["PERSISTENT", "NON_PERSISTENT"], + "default": "PERSISTENT", + "description": "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf." + }, + "JMSPriority": { + "type": "integer", + "default": 4, + "description": "The priority of the message. This may be set by your JMS Provider on your behalf." + }, + "JMSExpires": { + "type": "integer", + "description": "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType": { + "type": ["string", "null"], + "description": "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID": { + "type": ["string", "null"], + "description": "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo": { + "type": "string", + "description": "The queue or topic that the message sender expects replies to." + } + } + }, + "bindingVersion": "0.0.1", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding.json new file mode 100644 index 00000000..5f36456a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/message/binding.json @@ -0,0 +1,44 @@ +{ + "headers": { + "type": "object", + "required": ["JMSMessageID"], + "properties": { + "JMSMessageID": { + "type": ["string", "null"], + "description": "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp": { + "type": "integer", + "description": "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode": { + "type": "string", + "enum": ["PERSISTENT", "NON_PERSISTENT"], + "default": "PERSISTENT", + "description": "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf." + }, + "JMSPriority": { + "type": "integer", + "default": 4, + "description": "The priority of the message. This may be set by your JMS Provider on your behalf." + }, + "JMSExpires": { + "type": "integer", + "description": "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType": { + "type": ["string", "null"], + "description": "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID": { + "type": ["string", "null"], + "description": "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo": { + "type": "string", + "description": "The queue or topic that the message sender expects replies to." + } + } + }, + "bindingVersion": "0.0.1" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding - wrongly extended.json new file mode 100644 index 00000000..e060a0ea --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.0.1", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding.json new file mode 100644 index 00000000..be81020d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.0.1" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding - extended.json new file mode 100644 index 00000000..c160c064 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding - extended.json @@ -0,0 +1,14 @@ +{ + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "org.apache.activemq.ActiveMQConnectionFactory", + "properties" : [ { + "name" : "disableTimeStampsByDefault", + "value" : false + } ], + "clientID" : "my-application-1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding - wrongly extended.json new file mode 100644 index 00000000..d71c744e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding - wrongly extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion": "0.0.1", + "jmsConnectionFactory": "org.apache.activemq.ActiveMQConnectionFactory", + "properties": [ + { + "name": "disableTimeStampsByDefault", + "value": false + } + ], + "clientID": "my-application-1", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding.json b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding.json new file mode 100644 index 00000000..0e2513db --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/0.0.1/server/binding.json @@ -0,0 +1,11 @@ +{ + "jmsConnectionFactory": "org.apache.activemq.ActiveMQConnectionFactory", + "properties": [ + { + "name": "disableTimeStampsByDefault", + "value": false + } + ], + "clientID": "my-application-1", + "bindingVersion": "0.0.1" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding - extended.json new file mode 100644 index 00000000..998357b8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.0.1", + "destination" : "user-signed-up", + "destinationType" : "fifo-queue", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..3dea9472 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "destination": "user-signed-up", + "destinationType": "fifo-queue", + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding.json new file mode 100644 index 00000000..6766930e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/channel/binding.json @@ -0,0 +1,5 @@ +{ + "destination": "user-signed-up", + "destinationType": "fifo-queue", + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/latest/message/binding - extended.json new file mode 100644 index 00000000..5fb29ddb --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/message/binding - extended.json @@ -0,0 +1,49 @@ +{ + "bindingVersion" : "0.0.1", + "headers" : { + "type" : "object", + "required" : [ "JMSMessageID" ], + "properties" : { + "JMSMessageID" : { + "type" : [ "string", "null" ], + "description" : "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp" : { + "type" : "integer", + "description" : "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode" : { + "type" : "string", + "enum" : [ "PERSISTENT", "NON_PERSISTENT" ], + "description" : "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf.", + "default" : "PERSISTENT" + }, + "JMSPriority" : { + "type" : "integer", + "description" : "The priority of the message. This may be set by your JMS Provider on your behalf.", + "default" : 4 + }, + "JMSExpires" : { + "type" : "integer", + "description" : "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType" : { + "type" : [ "string", "null" ], + "description" : "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID" : { + "type" : [ "string", "null" ], + "description" : "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo" : { + "type" : "string", + "description" : "The queue or topic that the message sender expects replies to." + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..2b0c46de --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/message/binding - wrongly extended.json @@ -0,0 +1,50 @@ +{ + "headers": { + "type": "object", + "required": ["JMSMessageID"], + "properties": { + "JMSMessageID": { + "type": ["string", "null"], + "description": "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp": { + "type": "integer", + "description": "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode": { + "type": "string", + "enum": ["PERSISTENT", "NON_PERSISTENT"], + "default": "PERSISTENT", + "description": "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf." + }, + "JMSPriority": { + "type": "integer", + "default": 4, + "description": "The priority of the message. This may be set by your JMS Provider on your behalf." + }, + "JMSExpires": { + "type": "integer", + "description": "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType": { + "type": ["string", "null"], + "description": "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID": { + "type": ["string", "null"], + "description": "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo": { + "type": "string", + "description": "The queue or topic that the message sender expects replies to." + } + } + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/jms/latest/message/binding.json new file mode 100644 index 00000000..29c2de59 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/message/binding.json @@ -0,0 +1,44 @@ +{ + "headers": { + "type": "object", + "required": ["JMSMessageID"], + "properties": { + "JMSMessageID": { + "type": ["string", "null"], + "description": "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp": { + "type": "integer", + "description": "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode": { + "type": "string", + "enum": ["PERSISTENT", "NON_PERSISTENT"], + "default": "PERSISTENT", + "description": "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf." + }, + "JMSPriority": { + "type": "integer", + "default": 4, + "description": "The priority of the message. This may be set by your JMS Provider on your behalf." + }, + "JMSExpires": { + "type": "integer", + "description": "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType": { + "type": ["string", "null"], + "description": "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID": { + "type": ["string", "null"], + "description": "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo": { + "type": "string", + "description": "The queue or topic that the message sender expects replies to." + } + } + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/latest/server/binding - extended.json new file mode 100644 index 00000000..c160c064 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/server/binding - extended.json @@ -0,0 +1,14 @@ +{ + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "org.apache.activemq.ActiveMQConnectionFactory", + "properties" : [ { + "name" : "disableTimeStampsByDefault", + "value" : false + } ], + "clientID" : "my-application-1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..b24c037f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/server/binding - wrongly extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion": "latest", + "jmsConnectionFactory": "org.apache.activemq.ActiveMQConnectionFactory", + "properties": [ + { + "name": "disableTimeStampsByDefault", + "value": false + } + ], + "clientID": "my-application-1", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/jms/latest/server/binding.json new file mode 100644 index 00000000..c6049001 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/latest/server/binding.json @@ -0,0 +1,11 @@ +{ + "jmsConnectionFactory": "org.apache.activemq.ActiveMQConnectionFactory", + "properties": [ + { + "name": "disableTimeStampsByDefault", + "value": false + } + ], + "clientID": "my-application-1", + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..998357b8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.0.1", + "destination" : "user-signed-up", + "destinationType" : "fifo-queue", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..0e34cef0 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "destination": "user-signed-up", + "destinationType": "fifo-queue", + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding.json new file mode 100644 index 00000000..31e31eef --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/channel/binding.json @@ -0,0 +1,5 @@ +{ + "destination": "user-signed-up", + "destinationType": "fifo-queue", + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding - extended.json new file mode 100644 index 00000000..5fb29ddb --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding - extended.json @@ -0,0 +1,49 @@ +{ + "bindingVersion" : "0.0.1", + "headers" : { + "type" : "object", + "required" : [ "JMSMessageID" ], + "properties" : { + "JMSMessageID" : { + "type" : [ "string", "null" ], + "description" : "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp" : { + "type" : "integer", + "description" : "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode" : { + "type" : "string", + "enum" : [ "PERSISTENT", "NON_PERSISTENT" ], + "description" : "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf.", + "default" : "PERSISTENT" + }, + "JMSPriority" : { + "type" : "integer", + "description" : "The priority of the message. This may be set by your JMS Provider on your behalf.", + "default" : 4 + }, + "JMSExpires" : { + "type" : "integer", + "description" : "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType" : { + "type" : [ "string", "null" ], + "description" : "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID" : { + "type" : [ "string", "null" ], + "description" : "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo" : { + "type" : "string", + "description" : "The queue or topic that the message sender expects replies to." + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..b56ec30c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,50 @@ +{ + "headers": { + "type": "object", + "required": ["JMSMessageID"], + "properties": { + "JMSMessageID": { + "type": ["string", "null"], + "description": "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp": { + "type": "integer", + "description": "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode": { + "type": "string", + "enum": ["PERSISTENT", "NON_PERSISTENT"], + "default": "PERSISTENT", + "description": "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf." + }, + "JMSPriority": { + "type": "integer", + "default": 4, + "description": "The priority of the message. This may be set by your JMS Provider on your behalf." + }, + "JMSExpires": { + "type": "integer", + "description": "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType": { + "type": ["string", "null"], + "description": "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID": { + "type": ["string", "null"], + "description": "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo": { + "type": "string", + "description": "The queue or topic that the message sender expects replies to." + } + } + }, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding.json new file mode 100644 index 00000000..70499701 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/message/binding.json @@ -0,0 +1,44 @@ +{ + "headers": { + "type": "object", + "required": ["JMSMessageID"], + "properties": { + "JMSMessageID": { + "type": ["string", "null"], + "description": "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp": { + "type": "integer", + "description": "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode": { + "type": "string", + "enum": ["PERSISTENT", "NON_PERSISTENT"], + "default": "PERSISTENT", + "description": "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf." + }, + "JMSPriority": { + "type": "integer", + "default": 4, + "description": "The priority of the message. This may be set by your JMS Provider on your behalf." + }, + "JMSExpires": { + "type": "integer", + "description": "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType": { + "type": ["string", "null"], + "description": "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID": { + "type": ["string", "null"], + "description": "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo": { + "type": "string", + "description": "The queue or topic that the message sender expects replies to." + } + } + }, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding - extended.json new file mode 100644 index 00000000..c160c064 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding - extended.json @@ -0,0 +1,14 @@ +{ + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "org.apache.activemq.ActiveMQConnectionFactory", + "properties" : [ { + "name" : "disableTimeStampsByDefault", + "value" : false + } ], + "clientID" : "my-application-1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..70fd4e42 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion": "unknown version", + "jmsConnectionFactory": "org.apache.activemq.ActiveMQConnectionFactory", + "properties": [ + { + "name": "disableTimeStampsByDefault", + "value": false + } + ], + "clientID": "my-application-1", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding.json new file mode 100644 index 00000000..d4306674 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/unknown version/server/binding.json @@ -0,0 +1,11 @@ +{ + "jmsConnectionFactory": "org.apache.activemq.ActiveMQConnectionFactory", + "properties": [ + { + "name": "disableTimeStampsByDefault", + "value": false + } + ], + "clientID": "my-application-1", + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - extended.json new file mode 100644 index 00000000..998357b8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.0.1", + "destination" : "user-signed-up", + "destinationType" : "fifo-queue", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..62e3d960 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "destination": "user-signed-up", + "destinationType": "fifo-queue", + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding.json new file mode 100644 index 00000000..010bbb31 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding.json @@ -0,0 +1,5 @@ +{ + "destination": "user-signed-up", + "destinationType": "fifo-queue", + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - extended.json new file mode 100644 index 00000000..5fb29ddb --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - extended.json @@ -0,0 +1,49 @@ +{ + "bindingVersion" : "0.0.1", + "headers" : { + "type" : "object", + "required" : [ "JMSMessageID" ], + "properties" : { + "JMSMessageID" : { + "type" : [ "string", "null" ], + "description" : "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp" : { + "type" : "integer", + "description" : "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode" : { + "type" : "string", + "enum" : [ "PERSISTENT", "NON_PERSISTENT" ], + "description" : "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf.", + "default" : "PERSISTENT" + }, + "JMSPriority" : { + "type" : "integer", + "description" : "The priority of the message. This may be set by your JMS Provider on your behalf.", + "default" : 4 + }, + "JMSExpires" : { + "type" : "integer", + "description" : "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType" : { + "type" : [ "string", "null" ], + "description" : "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID" : { + "type" : [ "string", "null" ], + "description" : "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo" : { + "type" : "string", + "description" : "The queue or topic that the message sender expects replies to." + } + } + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..773ec110 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - wrongly extended.json @@ -0,0 +1,50 @@ +{ + "headers": { + "type": "object", + "required": ["JMSMessageID"], + "properties": { + "JMSMessageID": { + "type": ["string", "null"], + "description": "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp": { + "type": "integer", + "description": "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode": { + "type": "string", + "enum": ["PERSISTENT", "NON_PERSISTENT"], + "default": "PERSISTENT", + "description": "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf." + }, + "JMSPriority": { + "type": "integer", + "default": 4, + "description": "The priority of the message. This may be set by your JMS Provider on your behalf." + }, + "JMSExpires": { + "type": "integer", + "description": "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType": { + "type": ["string", "null"], + "description": "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID": { + "type": ["string", "null"], + "description": "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo": { + "type": "string", + "description": "The queue or topic that the message sender expects replies to." + } + } + }, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding.json new file mode 100644 index 00000000..a3907fb7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding.json @@ -0,0 +1,44 @@ +{ + "headers": { + "type": "object", + "required": ["JMSMessageID"], + "properties": { + "JMSMessageID": { + "type": ["string", "null"], + "description": "A unique message identifier. This may be set by your JMS Provider on your behalf." + }, + "JMSTimestamp": { + "type": "integer", + "description": "The time the message was sent. This may be set by your JMS Provider on your behalf. The time the message was sent. The value of the timestamp is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC." + }, + "JMSDeliveryMode": { + "type": "string", + "enum": ["PERSISTENT", "NON_PERSISTENT"], + "default": "PERSISTENT", + "description": "Denotes the delivery mode for the message. This may be set by your JMS Provider on your behalf." + }, + "JMSPriority": { + "type": "integer", + "default": 4, + "description": "The priority of the message. This may be set by your JMS Provider on your behalf." + }, + "JMSExpires": { + "type": "integer", + "description": "The time at which the message expires. This may be set by your JMS Provider on your behalf. A value of zero means that the message does not expire. Any non-zero value is the amount of time, measured in milliseconds, that has elapsed since midnight, January 1, 1970, UTC, at which the message will expire." + }, + "JMSType": { + "type": ["string", "null"], + "description": "The type of message. Some JMS providers use a message repository that contains the definitions of messages sent by applications. The 'JMSType' header field may reference a message's definition in the provider's repository. The JMS API does not define a standard message definition repository, nor does it define a naming policy for the definitions it contains. Some messaging systems require that a message type definition for each application message be created and that each message specify its type. In order to work with such JMS providers, JMS clients should assign a value to 'JMSType', whether the application makes use of it or not. This ensures that the field is properly set for those providers that require it." + }, + "JMSCorrelationID": { + "type": ["string", "null"], + "description": "The correlation identifier of the message. A client can use the 'JMSCorrelationID' header field to link one message with another. A typical use is to link a response message with its request message. Since each message sent by a JMS provider is assigned a message ID value, it is convenient to link messages via message ID, such message ID values must start with the 'ID:' prefix. Conversely, application-specified values must not start with the 'ID:' prefix; this is reserved for provider-generated message ID values." + }, + "JMSReplyTo": { + "type": "string", + "description": "The queue or topic that the message sender expects replies to." + } + } + }, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - extended.json new file mode 100644 index 00000000..de3a5262 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.0.1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - extended.json new file mode 100644 index 00000000..c160c064 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - extended.json @@ -0,0 +1,14 @@ +{ + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "org.apache.activemq.ActiveMQConnectionFactory", + "properties" : [ { + "name" : "disableTimeStampsByDefault", + "value" : false + } ], + "clientID" : "my-application-1", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..6902e97c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - wrongly extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion": "without version", + "jmsConnectionFactory": "org.apache.activemq.ActiveMQConnectionFactory", + "properties": [ + { + "name": "disableTimeStampsByDefault", + "value": false + } + ], + "clientID": "my-application-1", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding.json new file mode 100644 index 00000000..cfe06d6c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding.json @@ -0,0 +1,11 @@ +{ + "jmsConnectionFactory": "org.apache.activemq.ActiveMQConnectionFactory", + "properties": [ + { + "name": "disableTimeStampsByDefault", + "value": false + } + ], + "clientID": "my-application-1", + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index ee7fb107..4e85a07a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -57,7 +57,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -164,7 +167,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -284,7 +289,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -407,7 +414,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -527,7 +536,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -682,7 +693,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { @@ -799,7 +812,9 @@ }, "maxMsgLength" : 1024 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "topic" : "my-specific-topic-name", @@ -989,7 +1004,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { @@ -1211,7 +1228,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -1357,7 +1376,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { @@ -1425,7 +1446,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -1527,7 +1551,9 @@ }, "maxMsgLength" : 1024 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "topic" : "my-specific-topic-name", @@ -1632,7 +1658,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -1740,7 +1768,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 0234925e..15e1eb0c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -58,7 +58,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -178,7 +180,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -301,7 +305,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -421,7 +427,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -576,7 +584,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { @@ -693,7 +703,9 @@ }, "maxMsgLength" : 1024 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "topic" : "my-specific-topic-name", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 0736fd8a..70fefc8e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -92,7 +92,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 7ca0e4cf..061de456 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -81,7 +81,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 3bbef16a..9925da9a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -56,7 +56,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -176,7 +178,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -331,7 +335,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index fe6224be..430124e0 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -56,7 +56,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -176,7 +178,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 5d34607b..0342db3c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -56,7 +56,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 2e89b083..9da8b75a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -123,7 +123,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { @@ -345,7 +347,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -491,7 +495,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { @@ -559,7 +565,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -661,7 +670,9 @@ }, "maxMsgLength" : 1024 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "topic" : "my-specific-topic-name", @@ -766,7 +777,9 @@ "ibmmq" : { "bindingVersion" : "0.1.0" }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "groupId" : { @@ -874,7 +887,9 @@ "description" : "JMS stream message", "expiry" : 0 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1" + }, "kafka" : { "bindingVersion" : "0.4.0", "key" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index a071e10f..15b5773d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -37,7 +37,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index c4ac4c7c..7a5a724c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -66,7 +66,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -1216,7 +1219,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -2899,7 +2905,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 5947528c..81347aa1 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -78,7 +78,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -1761,7 +1764,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index a2f64a81..38240d93 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -47,7 +47,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 68afe87d..397bcbff 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -93,7 +93,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -204,7 +207,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -5097,7 +5103,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -12555,7 +12564,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index 5f99038c..9043dd74 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -95,7 +95,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", @@ -7553,7 +7556,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 8b84a4cd..6d74b30e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -61,7 +61,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 9e30b383..0a62455e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -64,7 +64,10 @@ "multiEndpointServer" : false, "heartBeatInterval" : 300 }, - "jms" : { }, + "jms" : { + "bindingVersion" : "0.0.1", + "jmsConnectionFactory" : "" + }, "kafka" : { "bindingVersion" : "0.4.0", "schemaRegistryUrl" : "https://my-schema-registry.com", From e7e574543e483c66484387afb9c5050965cf1a2a Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 28 Apr 2024 00:42:50 +0400 Subject: [PATCH 047/141] tests(bindings): Mercure 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/174 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../mercure/MercureChannelBinding.java | 32 +++++++++ .../mercure/MercureMessageBinding.java | 32 +++++++++ .../mercure/MercureOperationBinding.java | 32 +++++++++ .../mercure/MercureServerBinding.java | 32 +++++++++ .../_1_0/channel/MercureChannelBinding.java | 15 +++- .../_1_0/message/MercureMessageBinding.java | 15 +++- .../operation/MercureOperationBinding.java | 15 +++- .../v0/_1_0/server/MercureServerBinding.java | 15 +++- .../asyncapi/bindings/mercure/Mercure.java | 11 +++ .../bindings/mercure/MercureLatestTest.java | 54 ++++++++++++++ .../mercure/MercureUnknownVersionTest.java | 54 ++++++++++++++ .../bindings/mercure/MercureV0_1_0Test.java | 70 +++++++++++++++++++ .../mercure/MercureWithoutVersionTest.java | 54 ++++++++++++++ .../v2/2.0.0/model/asyncapi - extended.json | 56 +++++++++++---- .../model/channel/channelItem - extended.json | 24 +++++-- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 12 +++- ... with reference to message - extended.json | 8 ++- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 28 ++++++-- .../2.0.0/model/server/server - extended.json | 4 +- .../v2/2.6.0/model/asyncapi - extended.json | 12 +++- .../components/components - extended.json | 8 ++- .../2.6.0/model/server/server - extended.json | 4 +- .../v3/3.0.0/model/asyncapi - extended.json | 16 +++-- .../components/components - extended.json | 8 ++- .../3.0.0/model/server/server - extended.json | 4 +- .../server with reference - extended.json | 4 +- 33 files changed, 577 insertions(+), 62 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/Mercure.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureWithoutVersionTest.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index dad29d1f..ac3ba226 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -8,7 +8,7 @@ import com.asyncapi.bindings.ibmmq.IBMMQChannelBinding; import com.asyncapi.bindings.jms.JMSChannelBinding; import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; -import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; +import com.asyncapi.bindings.mercure.MercureChannelBinding; import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 9a20b7ab..0341d1d5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -8,7 +8,7 @@ import com.asyncapi.bindings.ibmmq.IBMMQMessageBinding; import com.asyncapi.bindings.jms.JMSMessageBinding; import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; -import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; +import com.asyncapi.bindings.mercure.MercureMessageBinding; import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index a2cab77b..51f617bd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -8,7 +8,7 @@ import com.asyncapi.bindings.ibmmq.IBMMQOperationBinding; import com.asyncapi.bindings.jms.JMSOperationBinding; import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; -import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; +import com.asyncapi.bindings.mercure.MercureOperationBinding; import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index d259171d..2fa73b14 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -8,7 +8,7 @@ import com.asyncapi.bindings.ibmmq.IBMMQServerBinding; import com.asyncapi.bindings.jms.JMSServerBinding; import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; -import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; +import com.asyncapi.bindings.mercure.MercureServerBinding; import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java new file mode 100644 index 00000000..0dd521f8 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.mercure; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Mercure channel binding. + * + * @version 0.1.0 + * @see Mercure channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class MercureChannelBinding extends ChannelBinding { +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java new file mode 100644 index 00000000..977c3b54 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.mercure; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Mercure message binding. + * + * @version 0.1.0 + * @see Mercure message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class MercureMessageBinding extends MessageBinding { +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java new file mode 100644 index 00000000..646b84a2 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.mercure; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Mercure operation binding. + * + * @version 0.1.0 + * @see Mercure operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class MercureOperationBinding extends OperationBinding { +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java new file mode 100644 index 00000000..67f182c6 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.mercure; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Mercure server binding. + * + * @version 0.1.0 + * @see Mercure server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class MercureServerBinding extends ServerBinding { +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java index d92a1832..7fcb400a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.mercure.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MercureChannelBinding extends ChannelBinding { +public class MercureChannelBinding extends com.asyncapi.bindings.mercure.MercureChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java index c765b2d8..f9b6dcc1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.mercure.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MercureMessageBinding extends MessageBinding { +public class MercureMessageBinding extends com.asyncapi.bindings.mercure.MercureMessageBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java index fe3907b7..540cab27 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.mercure.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MercureOperationBinding extends OperationBinding { +public class MercureOperationBinding extends com.asyncapi.bindings.mercure.MercureOperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java index 20921b2c..781e645a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.mercure.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MercureServerBinding extends ServerBinding { +public class MercureServerBinding extends com.asyncapi.bindings.mercure.MercureServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/Mercure.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/Mercure.java new file mode 100644 index 00000000..cc934cf4 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/Mercure.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.mercure; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("Mercure") +@SelectPackages("com.asyncapi.bindings.mercure") +public class Mercure { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureLatestTest.java new file mode 100644 index 00000000..b4c63f3c --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.mercure; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; +import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; +import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; +import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class MercureLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = MercureV0_1_0Test.channelBinding(); + super.bindingTypeClass = MercureChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = MercureV0_1_0Test.messageBinding(); + super.bindingTypeClass = MercureMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = MercureV0_1_0Test.operationBinding(); + super.bindingTypeClass = MercureOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = MercureV0_1_0Test.serverBinding(); + super.bindingTypeClass = MercureServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureUnknownVersionTest.java new file mode 100644 index 00000000..5f4a3938 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.mercure; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; +import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; +import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; +import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class MercureUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = MercureV0_1_0Test.channelBinding(); + super.bindingTypeClass = MercureChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = MercureV0_1_0Test.messageBinding(); + super.bindingTypeClass = MercureMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = MercureV0_1_0Test.operationBinding(); + super.bindingTypeClass = MercureOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = MercureV0_1_0Test.serverBinding(); + super.bindingTypeClass = MercureServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureV0_1_0Test.java new file mode 100644 index 00000000..e929f329 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureV0_1_0Test.java @@ -0,0 +1,70 @@ +package com.asyncapi.bindings.mercure; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; +import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; +import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; +import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class MercureV0_1_0Test { + + public static MercureChannelBinding channelBinding () { + return new MercureChannelBinding(); + } + + public static MercureMessageBinding messageBinding () { + return new MercureMessageBinding(); + } + + public static MercureOperationBinding operationBinding () { + return new MercureOperationBinding(); + } + + public static MercureServerBinding serverBinding () { + return new MercureServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = MercureChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = MercureMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = MercureOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = MercureServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureWithoutVersionTest.java new file mode 100644 index 00000000..3b3e2b53 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mercure/MercureWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.mercure; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding; +import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding; +import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding; +import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class MercureWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = MercureV0_1_0Test.channelBinding(); + super.bindingTypeClass = MercureChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = MercureV0_1_0Test.messageBinding(); + super.bindingTypeClass = MercureMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = MercureV0_1_0Test.operationBinding(); + super.bindingTypeClass = MercureOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = MercureV0_1_0Test.serverBinding(); + super.bindingTypeClass = MercureServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 4e85a07a..7a7cb8d2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -66,7 +66,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -181,7 +183,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -303,7 +307,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -428,7 +434,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -550,7 +558,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -706,7 +716,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, @@ -828,7 +840,9 @@ "max.message.bytes" : 1048588 } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { }, "mqtt5" : { }, "nats" : { }, @@ -1017,7 +1031,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, @@ -1242,7 +1258,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -1389,7 +1407,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, @@ -1455,7 +1475,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -1567,7 +1589,9 @@ "max.message.bytes" : 1048588 } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { }, "mqtt5" : { }, "nats" : { }, @@ -1672,7 +1696,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -1781,7 +1807,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 15e1eb0c..85b04e83 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -72,7 +72,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -194,7 +196,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -319,7 +323,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -441,7 +447,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -597,7 +605,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, @@ -719,7 +729,9 @@ "max.message.bytes" : 1048588 } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { }, "mqtt5" : { }, "nats" : { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 70fefc8e..8ed7bb46 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -105,7 +105,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 061de456..769478e9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -94,7 +94,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 9925da9a..0b18e385 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -70,7 +70,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -192,7 +194,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -348,7 +352,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index 430124e0..ef247471 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -70,7 +70,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -192,7 +194,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 0342db3c..4112deb7 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -70,7 +70,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 9da8b75a..441e57b8 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -136,7 +136,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, @@ -361,7 +363,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -508,7 +512,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, @@ -574,7 +580,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -686,7 +694,9 @@ "max.message.bytes" : 1048588 } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { }, "mqtt5" : { }, "nats" : { }, @@ -791,7 +801,9 @@ "enum" : [ "myClientId" ] } }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "qos" : 2, @@ -900,7 +912,9 @@ "schemaIdPayloadEncoding" : "apicurio-new", "schemaLookupStrategy" : "TopicIdStrategy" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index 15b5773d..dafb6392 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -46,7 +46,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 7a5a724c..3c81d273 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -75,7 +75,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -1228,7 +1230,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -2914,7 +2918,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 81347aa1..138e4b65 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -87,7 +87,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -1773,7 +1775,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 38240d93..737ae62d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -56,7 +56,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 397bcbff..bf7027a0 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -102,7 +102,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -216,7 +218,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -5112,7 +5116,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -12573,7 +12579,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index 9043dd74..8cc6692a 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -104,7 +104,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", @@ -7565,7 +7567,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 6d74b30e..f535394b 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -70,7 +70,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 0a62455e..902473a3 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -73,7 +73,9 @@ "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, - "mercure" : { }, + "mercure" : { + "bindingVersion" : "0.1.0" + }, "mqtt" : { "bindingVersion" : "0.1.0", "clientId" : "guest", From 9857fa5bb1d61749b6df4a7e202a5f71bd2a0c74 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 29 Apr 2024 12:07:08 +0400 Subject: [PATCH 048/141] tests(bindings): NATS 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/176 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/nats/NATSChannelBinding.java | 31 ++++++++ .../bindings/nats/NATSMessageBinding.java | 31 ++++++++ .../bindings/nats/NATSOperationBinding.java | 29 ++++++++ .../bindings/nats/NATSServerBinding.java | 31 ++++++++ .../v0/_1_0/channel/NATSChannelBinding.java | 14 +++- .../v0/_1_0/message/NATSMessageBinding.java | 14 +++- .../_1_0/operation/NATSOperationBinding.java | 19 ++--- .../v0/_1_0/server/NATSServerBinding.java | 14 +++- .../com/asyncapi/bindings/nats/NATS.java | 11 +++ .../bindings/nats/NATSLatestTest.java | 54 ++++++++++++++ .../bindings/nats/NATSUnknownVersionTest.java | 54 ++++++++++++++ .../bindings/nats/NATSV0_1_0Test.java | 72 +++++++++++++++++++ .../bindings/nats/NATSWithoutVersionTest.java | 54 ++++++++++++++ .../operation/NATSOperationBindingTest.kt | 21 ------ .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_6_0/model/server/ServerTest.kt | 4 +- .../v3/_0_0/model/operation/OperationTest.kt | 6 +- .../model/operation/OperationTraitTest.kt | 6 +- .../0.1.0/channel/binding - extended.json | 8 +++ .../channel/binding - wrongly extended.json | 9 +++ .../bindings/nats/0.1.0/channel/binding.json | 3 + .../0.1.0/message/binding - extended.json | 8 +++ .../message/binding - wrongly extended.json | 9 +++ .../bindings/nats/0.1.0/message/binding.json | 3 + .../operation/binding - extended.json} | 0 .../binding - wrongly extended.json} | 0 .../operation/binding.json} | 0 .../nats/0.1.0/server/binding - extended.json | 8 +++ .../server/binding - wrongly extended.json | 9 +++ .../bindings/nats/0.1.0/server/binding.json | 3 + .../latest/channel/binding - extended.json | 8 +++ .../channel/binding - wrongly extended.json | 9 +++ .../bindings/nats/latest/channel/binding.json | 3 + .../latest/message/binding - extended.json | 8 +++ .../message/binding - wrongly extended.json | 9 +++ .../bindings/nats/latest/message/binding.json | 3 + .../latest/operation/binding - extended.json | 9 +++ .../operation/binding - wrongly extended.json | 10 +++ .../nats/latest/operation/binding.json | 4 ++ .../latest/server/binding - extended.json | 8 +++ .../server/binding - wrongly extended.json | 9 +++ .../bindings/nats/latest/server/binding.json | 3 + .../channel/binding - extended.json | 8 +++ .../channel/binding - wrongly extended.json | 9 +++ .../nats/unknown version/channel/binding.json | 3 + .../message/binding - extended.json | 8 +++ .../message/binding - wrongly extended.json | 9 +++ .../nats/unknown version/message/binding.json | 3 + .../operation/binding - extended.json | 9 +++ .../operation/binding - wrongly extended.json | 10 +++ .../unknown version/operation/binding.json | 4 ++ .../server/binding - extended.json | 8 +++ .../server/binding - wrongly extended.json | 9 +++ .../nats/unknown version/server/binding.json | 3 + .../channel/binding - extended.json | 8 +++ .../channel/binding - wrongly extended.json | 8 +++ .../nats/without version/channel/binding.json | 1 + .../message/binding - extended.json | 8 +++ .../message/binding - wrongly extended.json | 8 +++ .../nats/without version/message/binding.json | 1 + .../operation/binding - extended.json | 9 +++ .../operation/binding - wrongly extended.json | 10 +++ .../without version/operation/binding.json | 4 ++ .../server/binding - extended.json | 8 +++ .../server/binding - wrongly extended.json | 8 +++ .../nats/without version/server/binding.json | 1 + .../v2/2.0.0/model/asyncapi - extended.json | 32 ++++++--- .../model/channel/channelItem - extended.json | 8 ++- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 4 +- .../components/components - extended.json | 20 ++++-- .../2.0.0/model/server/server - extended.json | 4 +- .../v2/2.6.0/model/asyncapi - extended.json | 12 +++- .../components/components - extended.json | 8 ++- .../2.6.0/model/server/server - extended.json | 4 +- .../v3/3.0.0/model/asyncapi - extended.json | 16 +++-- .../components/components - extended.json | 8 ++- .../3.0.0/model/server/server - extended.json | 4 +- .../server with reference - extended.json | 4 +- 87 files changed, 835 insertions(+), 86 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATS.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt create mode 100644 asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding.json rename asyncapi-core/src/test/resources/bindings/nats/{operation/natsOperationBinding - extended.json => 0.1.0/operation/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/nats/{operation/natsOperationBinding - wrongly extended.json => 0.1.0/operation/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/nats/{operation/natsOperationBinding.json => 0.1.0/operation/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/nats/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index ac3ba226..0d801ff9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.bindings.mercure.MercureChannelBinding; import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; -import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; +import com.asyncapi.bindings.nats.NATSChannelBinding; import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 0341d1d5..452b0c5b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.bindings.mercure.MercureMessageBinding; import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; -import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; +import com.asyncapi.bindings.nats.NATSMessageBinding; import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 51f617bd..00eb52ec 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.bindings.mercure.MercureOperationBinding; import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; +import com.asyncapi.bindings.nats.NATSOperationBinding; import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 2fa73b14..72c8d5fd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -11,7 +11,7 @@ import com.asyncapi.bindings.mercure.MercureServerBinding; import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; -import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; +import com.asyncapi.bindings.nats.NATSServerBinding; import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSChannelBinding.java new file mode 100644 index 00000000..14b4d97a --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSChannelBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.nats; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes NATS channel binding. + * + * @version 0.1.0 + * @see NATS channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class NATSChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSMessageBinding.java new file mode 100644 index 00000000..5699aec1 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSMessageBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.nats; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes NATS message binding. + * + * @version 0.1.0 + * @see NATS message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class NATSMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSOperationBinding.java new file mode 100644 index 00000000..0553e736 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSOperationBinding.java @@ -0,0 +1,29 @@ +package com.asyncapi.bindings.nats; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes NATS operation binding. + * + * @version 0.1.0 + * @see NATS operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class NATSOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSServerBinding.java new file mode 100644 index 00000000..362ba17c --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSServerBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.nats; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes NATS channel binding. + * + * @version 0.1.0 + * @see NATS server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class NATSServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java index 48edd968..5256d244 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +18,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class NATSChannelBinding extends ChannelBinding { +public class NATSChannelBinding extends com.asyncapi.bindings.nats.NATSChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java index 7962703f..594c5238 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +18,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class NATSMessageBinding extends MessageBinding { +public class NATSMessageBinding extends com.asyncapi.bindings.nats.NATSMessageBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java index 85c624e9..b808f11e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java @@ -20,7 +20,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes NATS operation binding.") -public class NATSOperationBinding extends OperationBinding { +public class NATSOperationBinding extends com.asyncapi.bindings.nats.NATSOperationBinding { /** * Defines the name of the queue to use. It MUST NOT exceed 255 characters. @@ -34,13 +34,14 @@ public class NATSOperationBinding extends OperationBinding { @JsonPropertyDescription("Defines the name of the queue to use. It MUST NOT exceed 255 characters.") private String queue; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java index e5414531..076ebef1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +18,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class NATSServerBinding extends ServerBinding { +public class NATSServerBinding extends com.asyncapi.bindings.nats.NATSServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATS.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATS.java new file mode 100644 index 00000000..feb12c40 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATS.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.nats; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("nats") +@SelectPackages("com.asyncapi.bindings.nats") +public class NATS { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSLatestTest.java new file mode 100644 index 00000000..2ad71451 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.nats; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; +import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; +import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class NATSLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = NATSV0_1_0Test.channelBinding(); + super.bindingTypeClass = NATSChannelBinding.class; + super.pathToBindingJson = "/bindings/nats/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = NATSV0_1_0Test.messageBinding(); + super.bindingTypeClass = NATSMessageBinding.class; + super.pathToBindingJson = "/bindings/nats/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = NATSV0_1_0Test.operationBinding(); + super.bindingTypeClass = NATSOperationBinding.class; + super.pathToBindingJson = "/bindings/nats/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = NATSV0_1_0Test.serverBinding(); + super.bindingTypeClass = NATSServerBinding.class; + super.pathToBindingJson = "/bindings/nats/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSUnknownVersionTest.java new file mode 100644 index 00000000..a4809d1e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.nats; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; +import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; +import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class NATSUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = NATSV0_1_0Test.channelBinding(); + super.bindingTypeClass = NATSChannelBinding.class; + super.pathToBindingJson = "/bindings/nats/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = NATSV0_1_0Test.messageBinding(); + super.bindingTypeClass = NATSMessageBinding.class; + super.pathToBindingJson = "/bindings/nats/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = NATSV0_1_0Test.operationBinding(); + super.bindingTypeClass = NATSOperationBinding.class; + super.pathToBindingJson = "/bindings/nats/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = NATSV0_1_0Test.serverBinding(); + super.bindingTypeClass = NATSServerBinding.class; + super.pathToBindingJson = "/bindings/nats/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSV0_1_0Test.java new file mode 100644 index 00000000..aa8b7287 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSV0_1_0Test.java @@ -0,0 +1,72 @@ +package com.asyncapi.bindings.nats; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; +import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; +import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class NATSV0_1_0Test { + + public static NATSChannelBinding channelBinding () { + return new NATSChannelBinding(); + } + + public static NATSMessageBinding messageBinding () { + return new NATSMessageBinding(); + } + + public static NATSOperationBinding operationBinding () { + return NATSOperationBinding.builder() + .queue("messages") + .build(); + } + + public static NATSServerBinding serverBinding () { + return new NATSServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = NATSChannelBinding.class; + super.pathToBindingJson = "/bindings/nats/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = NATSMessageBinding.class; + super.pathToBindingJson = "/bindings/nats/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = NATSOperationBinding.class; + super.pathToBindingJson = "/bindings/nats/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = NATSServerBinding.class; + super.pathToBindingJson = "/bindings/nats/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSWithoutVersionTest.java new file mode 100644 index 00000000..011fa1ca --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATSWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.nats; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding; +import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding; +import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBinding; +import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class NATSWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = NATSV0_1_0Test.channelBinding(); + super.bindingTypeClass = NATSChannelBinding.class; + super.pathToBindingJson = "/bindings/nats/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = NATSV0_1_0Test.messageBinding(); + super.bindingTypeClass = NATSMessageBinding.class; + super.pathToBindingJson = "/bindings/nats/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = NATSV0_1_0Test.operationBinding(); + super.bindingTypeClass = NATSOperationBinding.class; + super.pathToBindingJson = "/bindings/nats/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = NATSV0_1_0Test.serverBinding(); + super.bindingTypeClass = NATSServerBinding.class; + super.pathToBindingJson = "/bindings/nats/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/nats/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/nats/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt deleted file mode 100644 index b2fdfd18..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBindingTest.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.asyncapi.bindings.nats.v0._1_0.operation - -import com.asyncapi.v3.SerDeTest - -class NATSOperationBindingTest: SerDeTest() { - - override fun objectClass() = NATSOperationBinding::class.java - - override fun baseObjectJson() = "/bindings/nats/operation/natsOperationBinding.json" - - override fun extendedObjectJson() = "/bindings/nats/operation/natsOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/nats/operation/natsOperationBinding - wrongly extended.json" - - override fun build(): NATSOperationBinding { - return NATSOperationBinding.builder() - .queue("messages") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index fe5ae4b5..61f65f50 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest +import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding @@ -112,7 +112,7 @@ class OperationTest { Pair("mercure", MercureOperationBinding()), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", MQTT5OperationBinding()), - Pair("nats", NATSOperationBindingTest().build()), + Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", PulsarOperationBinding()), Pair("redis", RedisOperationBinding()), Pair("sns", SNSOperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 866e0080..c43ef157 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest +import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding @@ -61,7 +61,7 @@ class OperationTraitTest: SerDeTest() { Pair("mercure", MercureOperationBinding()), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", MQTT5OperationBinding()), - Pair("nats", NATSOperationBindingTest().build()), + Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", PulsarOperationBinding()), Pair("redis", RedisOperationBinding()), Pair("sns", SNSOperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index dae98eff..eefe4250 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest +import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest class OperationWithReferenceToMessageTest: SerDeTest() { @@ -147,7 +147,7 @@ class OperationTest { Pair("mercure", Reference("#/components/operationBindings/mercure")), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), - Pair("nats", NATSOperationBindingTest().build()), + Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar")), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 414e8850..967ed502 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest +import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest class OperationTraitTest: SerDeTest() { @@ -51,7 +51,7 @@ class OperationTraitTest: SerDeTest() { Pair("mercure", Reference("#/components/operationBindings/mercure")), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), - Pair("nats", NATSOperationBindingTest().build()), + Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar")), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index acf5974e..04a463ff 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding -import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding +import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding @@ -109,7 +109,7 @@ class ServerTest: SerDeTest() { .sessionExpiryInterval(60) .build() ), - Pair("nats", NATSServerBinding()), + Pair("nats", NATSV0_1_0Test.serverBinding()), Pair( "pulsar", PulsarServerBinding.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index fde673a3..7d72786a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest +import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest @@ -78,7 +78,7 @@ class OperationTest: SerDeTest() { Pair("mercure", Reference("#/components/operationBindings/mercure")), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), - Pair("nats", NATSOperationBindingTest().build()), + Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar")), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), @@ -138,7 +138,7 @@ class OperationTestWithReference: SerDeTest() { ), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), - Pair("nats", NATSOperationBindingTest().build()), + Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 1b1f7ccc..e91737c7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest -import com.asyncapi.bindings.nats.v0._1_0.operation.NATSOperationBindingTest +import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest @@ -60,7 +60,7 @@ class OperationTraitTest: SerDeTest() { ), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), - Pair("nats", NATSOperationBindingTest().build()), + Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar") ), @@ -120,7 +120,7 @@ class OperationTraitTestWithReference: SerDeTest() { ), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), - Pair("nats", NATSOperationBindingTest().build()), + Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar") ), diff --git a/asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/nats/0.1.0/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/nats/0.1.0/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/nats/operation/natsOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/nats/0.1.0/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/0.1.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/latest/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/nats/latest/message/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding - extended.json new file mode 100644 index 00000000..0228f02a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.1.0", + "queue" : "messages", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..69321bc2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "queue": "messages", + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding.json new file mode 100644 index 00000000..d1726ebe --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/operation/binding.json @@ -0,0 +1,4 @@ +{ + "queue": "messages", + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/latest/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/nats/latest/server/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/latest/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..0228f02a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.1.0", + "queue" : "messages", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..268c14f8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "queue": "messages", + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding.json new file mode 100644 index 00000000..a27b1d07 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/operation/binding.json @@ -0,0 +1,4 @@ +{ + "queue": "messages", + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/unknown version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/channel/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/without version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/message/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/nats/without version/message/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/message/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - extended.json new file mode 100644 index 00000000..0228f02a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.1.0", + "queue" : "messages", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0c99fecc --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "queue": "messages", + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding.json new file mode 100644 index 00000000..5964edad --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding.json @@ -0,0 +1,4 @@ +{ + "queue": "messages", + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/nats/without version/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/server/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/nats/without version/server/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/server/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 7a7cb8d2..6ab1e794 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -85,7 +85,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -723,7 +725,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" @@ -845,7 +849,9 @@ }, "mqtt" : { }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "namespace" : "staging", @@ -1038,7 +1044,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" @@ -1414,7 +1422,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" @@ -1494,7 +1504,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -1594,7 +1606,9 @@ }, "mqtt" : { }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "namespace" : "staging", @@ -1814,7 +1828,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 85b04e83..d1d18312 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -612,7 +612,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" @@ -734,7 +736,9 @@ }, "mqtt" : { }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "namespace" : "staging", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 8ed7bb46..d5e03b9b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -112,7 +112,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 769478e9..35275db7 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -101,7 +101,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 0b18e385..1750b91a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -359,7 +359,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 441e57b8..27fbcd1c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -143,7 +143,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" @@ -519,7 +521,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" @@ -599,7 +603,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -699,7 +705,9 @@ }, "mqtt" : { }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "namespace" : "staging", @@ -919,7 +927,9 @@ "bindingVersion" : "0.1.0" }, "mqtt5" : { }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { }, "redis" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index dafb6392..de061ec3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -65,7 +65,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 3c81d273..3718c9cb 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -94,7 +94,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -1249,7 +1251,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -2937,7 +2941,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 138e4b65..77b9dc0d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -106,7 +106,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -1794,7 +1796,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 737ae62d..921af807 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -75,7 +75,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index bf7027a0..5b49bc37 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -121,7 +121,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -237,7 +239,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -5135,7 +5139,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -12598,7 +12604,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index 8cc6692a..ea87c302 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -123,7 +123,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" @@ -7586,7 +7588,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index f535394b..7792b7bb 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -89,7 +89,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 902473a3..0c6eb07f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -92,7 +92,9 @@ "sessionExpiryInterval" : 60, "bindingVersion" : "0.2.0" }, - "nats" : { }, + "nats" : { + "bindingVersion" : "0.1.0" + }, "pulsar" : { "bindingVersion" : "0.1.0", "tenant" : "contoso" From a38bb80037ee84f93df008da43afa6cf9a33f887 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 29 Apr 2024 18:37:38 +0400 Subject: [PATCH 049/141] tests(bindings): Pulsar 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/177 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/pulsar/PulsarChannelBinding.java | 29 ++++++ .../bindings/pulsar/PulsarMessageBinding.java | 31 +++++++ .../pulsar/PulsarOperationBinding.java | 31 +++++++ .../bindings/pulsar/PulsarServerBinding.java | 29 ++++++ .../v0/_1_0/channel/PulsarChannelBinding.java | 20 ++--- .../v0/_1_0/message/PulsarMessageBinding.java | 15 +++- .../operation/PulsarOperationBinding.java | 15 +++- .../v0/_1_0/server/PulsarServerBinding.java | 20 ++--- .../com/asyncapi/bindings/pulsar/Pulsar.java | 11 +++ .../bindings/pulsar/PulsarLatestTest.java | 54 ++++++++++++ .../pulsar/PulsarUnknownVersionTest.java | 54 ++++++++++++ .../bindings/pulsar/PulsarV0_1_0Test.java | 88 +++++++++++++++++++ .../pulsar/PulsarWithoutVersionTest.java | 54 ++++++++++++ .../_1_0/channel/PulsarChannelBindingTest.kt | 31 ------- .../v0/_1_0/server/PulsarServerBindingTest.kt | 25 ------ .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../v3/_0_0/model/channel/ChannelTest.kt | 6 +- .../channel/binding - extended.json} | 0 .../channel/binding - wrongly extended.json} | 0 .../channel/binding.json} | 0 .../0.1.0/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../pulsar/0.1.0/message/binding.json | 3 + .../0.1.0/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../pulsar/0.1.0/operation/binding.json | 3 + .../server/binding - extended.json} | 0 .../server/binding - wrongly extended.json} | 0 .../server/binding.json} | 0 .../latest/channel/binding - extended.json | 18 ++++ .../channel/binding - wrongly extended.json | 22 +++++ .../pulsar/latest/channel/binding.json | 16 ++++ .../latest/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../pulsar/latest/message/binding.json | 3 + .../latest/operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../pulsar/latest/operation/binding.json | 3 + .../latest/server/binding - extended.json | 9 ++ .../server/binding - wrongly extended.json | 10 +++ .../pulsar/latest/server/binding.json | 4 + .../channel/binding - extended.json | 18 ++++ .../channel/binding - wrongly extended.json | 22 +++++ .../unknown version/channel/binding.json | 16 ++++ .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../unknown version/message/binding.json | 3 + .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../unknown version/operation/binding.json | 3 + .../server/binding - extended.json | 9 ++ .../server/binding - wrongly extended.json | 10 +++ .../unknown version/server/binding.json | 4 + .../channel/binding - extended.json | 18 ++++ .../channel/binding - wrongly extended.json | 22 +++++ .../without version/channel/binding.json | 16 ++++ .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../without version/message/binding.json | 3 + .../operation/binding - extended.json | 8 ++ .../operation/binding - wrongly extended.json | 9 ++ .../without version/operation/binding.json | 3 + .../server/binding - extended.json | 9 ++ .../server/binding - wrongly extended.json | 10 +++ .../without version/server/binding.json | 4 + .../v2/2.0.0/model/asyncapi - extended.json | 40 ++++++--- .../model/channel/channelItem - extended.json | 20 +++-- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 12 ++- ... with reference to message - extended.json | 8 +- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 20 +++-- 78 files changed, 919 insertions(+), 119 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/Pulsar.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt rename asyncapi-core/src/test/resources/bindings/pulsar/{channel/pulsarChannelBinding - extended.json => 0.1.0/channel/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/pulsar/{channel/pulsarChannelBinding - wrongly extended.json => 0.1.0/channel/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/pulsar/{channel/pulsarChannelBinding.json => 0.1.0/channel/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding.json rename asyncapi-core/src/test/resources/bindings/pulsar/{server/pulsarServerBinding - extended.json => 0.1.0/server/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/pulsar/{server/pulsarServerBinding - wrongly extended.json => 0.1.0/server/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/pulsar/{server/pulsarServerBinding.json => 0.1.0/server/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 0d801ff9..88b3dcbf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.NATSChannelBinding; -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; +import com.asyncapi.bindings.pulsar.PulsarChannelBinding; import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 452b0c5b..80a0c493 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; import com.asyncapi.bindings.nats.NATSMessageBinding; -import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; +import com.asyncapi.bindings.pulsar.PulsarMessageBinding; import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 00eb52ec..301314b7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; import com.asyncapi.bindings.nats.NATSOperationBinding; -import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; +import com.asyncapi.bindings.pulsar.PulsarOperationBinding; import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 72c8d5fd..30da6a62 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -12,7 +12,7 @@ import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; import com.asyncapi.bindings.nats.NATSServerBinding; -import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; +import com.asyncapi.bindings.pulsar.PulsarServerBinding; import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java new file mode 100644 index 00000000..f85e4e37 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java @@ -0,0 +1,29 @@ +package com.asyncapi.bindings.pulsar; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Pulsar channel binding. + * + * @version 0.1.0 + * @see Pulsar channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class PulsarChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java new file mode 100644 index 00000000..9a495626 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.pulsar; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Pulsar message binding. + *

+ * This object MUST NOT contain any properties. Its name is reserved for future use. + * + * @version 0.1.0 + * @see Pulsar message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class PulsarMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java new file mode 100644 index 00000000..289d1229 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.pulsar; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Pulsar operation binding. + *

+ * This object MUST NOT contain any properties. Its name is reserved for future use. + * + * @version 0.1.0 + * @see Pulsar operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class PulsarOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java new file mode 100644 index 00000000..0b164b6d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java @@ -0,0 +1,29 @@ +package com.asyncapi.bindings.pulsar; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Pulsar server binding. + * + * @version 0.1.0 + * @see Redis server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class PulsarServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java index b3b9703f..91f19357 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.pulsar.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -23,7 +22,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Pulsar channel binding.") -public class PulsarChannelBinding extends ChannelBinding { +public class PulsarChannelBinding extends com.asyncapi.bindings.pulsar.PulsarChannelBinding { /** * The namespace the channel is associated with. @@ -89,13 +88,14 @@ public class PulsarChannelBinding extends ChannelBinding { @JsonPropertyDescription("Message deduplication. When true, it ensures that each message produced on Pulsar topics is persisted to disk only once.") private Boolean deduplication; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java index e8091518..fb8eeab9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.pulsar.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * Describes Pulsar message binding. @@ -19,5 +19,16 @@ @Builder @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class PulsarMessageBinding extends MessageBinding { +public class PulsarMessageBinding extends com.asyncapi.bindings.pulsar.PulsarMessageBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java index 6e5f0934..d4fea223 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.pulsar.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * Describes Pulsar operation binding. @@ -19,5 +19,16 @@ @Builder @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class PulsarOperationBinding extends OperationBinding { +public class PulsarOperationBinding extends com.asyncapi.bindings.pulsar.PulsarOperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java index 2b907c42..9fcc0346 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.pulsar.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -20,7 +19,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Pulsar server binding.") -public class PulsarServerBinding extends ServerBinding { +public class PulsarServerBinding extends com.asyncapi.bindings.pulsar.PulsarServerBinding { /** * The pulsar tenant. If omitted, "public" MUST be assumed. @@ -31,13 +30,14 @@ public class PulsarServerBinding extends ServerBinding { @JsonPropertyDescription("The pulsar tenant. If omitted, \"public\" MUST be assumed.") private String tenant = "public"; - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/Pulsar.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/Pulsar.java new file mode 100644 index 00000000..75b2348e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/Pulsar.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.pulsar; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("Pulsar") +@SelectPackages("com.asyncapi.bindings.pulsar") +public class Pulsar { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarLatestTest.java new file mode 100644 index 00000000..f5202ac7 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.pulsar; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class PulsarLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = PulsarV0_1_0Test.channelBinding(); + super.bindingTypeClass = PulsarChannelBinding.class; + super.pathToBindingJson = "/bindings/pulsar/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = PulsarV0_1_0Test.messageBinding(); + super.bindingTypeClass = PulsarMessageBinding.class; + super.pathToBindingJson = "/bindings/pulsar/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = PulsarV0_1_0Test.operationBinding(); + super.bindingTypeClass = PulsarOperationBinding.class; + super.pathToBindingJson = "/bindings/pulsar/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = PulsarV0_1_0Test.serverBinding(); + super.bindingTypeClass = PulsarServerBinding.class; + super.pathToBindingJson = "/bindings/pulsar/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarUnknownVersionTest.java new file mode 100644 index 00000000..88d98fbb --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.pulsar; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class PulsarUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = PulsarV0_1_0Test.channelBinding(); + super.bindingTypeClass = PulsarChannelBinding.class; + super.pathToBindingJson = "/bindings/pulsar/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = PulsarV0_1_0Test.messageBinding(); + super.bindingTypeClass = PulsarMessageBinding.class; + super.pathToBindingJson = "/bindings/pulsar/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = PulsarV0_1_0Test.operationBinding(); + super.bindingTypeClass = PulsarOperationBinding.class; + super.pathToBindingJson = "/bindings/pulsar/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = PulsarV0_1_0Test.serverBinding(); + super.bindingTypeClass = PulsarServerBinding.class; + super.pathToBindingJson = "/bindings/pulsar/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarV0_1_0Test.java new file mode 100644 index 00000000..c793946c --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarV0_1_0Test.java @@ -0,0 +1,88 @@ +package com.asyncapi.bindings.pulsar; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelPersistence; +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelRetentionDefinition; +import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.1.0") +public class PulsarV0_1_0Test { + + public static PulsarChannelBinding channelBinding () { + return PulsarChannelBinding.builder() + .namespace("staging") + .persistence(PulsarChannelPersistence.PERSISTENT) + .compaction(1000) + .geoReplication(List.of("us-east1", "us-west1")) + .retention(PulsarChannelRetentionDefinition.builder() + .time(7) + .size(1000) + .build() + ) + .ttl(360) + .deduplication(false) + .build(); + } + + public static PulsarMessageBinding messageBinding () { + return new PulsarMessageBinding(); + } + + public static PulsarOperationBinding operationBinding () { + return new PulsarOperationBinding(); + } + + public static PulsarServerBinding serverBinding () { + return PulsarServerBinding.builder() + .tenant("contoso") + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = PulsarChannelBinding.class; + super.pathToBindingJson = "/bindings/pulsar/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = PulsarMessageBinding.class; + super.pathToBindingJson = "/bindings/pulsar/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = PulsarOperationBinding.class; + super.pathToBindingJson = "/bindings/pulsar/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = PulsarServerBinding.class; + super.pathToBindingJson = "/bindings/pulsar/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarWithoutVersionTest.java new file mode 100644 index 00000000..70bd410e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/PulsarWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.pulsar; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding; +import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class PulsarWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = PulsarV0_1_0Test.channelBinding(); + super.bindingTypeClass = PulsarChannelBinding.class; + super.pathToBindingJson = "/bindings/pulsar/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = PulsarV0_1_0Test.messageBinding(); + super.bindingTypeClass = PulsarMessageBinding.class; + super.pathToBindingJson = "/bindings/pulsar/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = PulsarV0_1_0Test.operationBinding(); + super.bindingTypeClass = PulsarOperationBinding.class; + super.pathToBindingJson = "/bindings/pulsar/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = PulsarV0_1_0Test.serverBinding(); + super.bindingTypeClass = PulsarServerBinding.class; + super.pathToBindingJson = "/bindings/pulsar/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/pulsar/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/pulsar/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt deleted file mode 100644 index 5b8e1744..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBindingTest.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.asyncapi.bindings.pulsar.v0._1_0.channel - -import com.asyncapi.v3.SerDeTest - -class PulsarChannelBindingTest: SerDeTest() { - - override fun objectClass() = PulsarChannelBinding::class.java - - override fun baseObjectJson() = "/bindings/pulsar/channel/pulsarChannelBinding.json" - - override fun extendedObjectJson() = "/bindings/pulsar/channel/pulsarChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/pulsar/channel/pulsarChannelBinding - wrongly extended.json" - - override fun build(): PulsarChannelBinding { - return PulsarChannelBinding.builder() - .namespace("staging") - .persistence(PulsarChannelPersistence.PERSISTENT) - .compaction(1000) - .geoReplication(listOf("us-east1", "us-west1")) - .retention(PulsarChannelRetentionDefinition.builder() - .time(7) - .size(1000) - .build() - ) - .ttl(360) - .deduplication(false) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt deleted file mode 100644 index 7a572e43..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBindingTest.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.asyncapi.bindings.pulsar.v0._1_0.server - -import com.asyncapi.v3.SerDeTest - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class PulsarServerBindingTest: SerDeTest() { - - override fun objectClass() = PulsarServerBinding::class.java - - override fun baseObjectJson() = "/bindings/pulsar/server/pulsarServerBinding.json" - - override fun extendedObjectJson() = "/bindings/pulsar/server/pulsarServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/pulsar/server/pulsarServerBinding - wrongly extended.json" - - override fun build(): PulsarServerBinding { - return PulsarServerBinding.builder() - .tenant("contoso") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index ebff2932..db1cdc0b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -17,7 +17,7 @@ import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest +import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding @@ -67,7 +67,7 @@ class ChannelItemTest: SerDeTest() { Pair("mqtt", MQTTChannelBinding()), Pair("mqtt5", MQTT5ChannelBinding()), Pair("nats", NATSChannelBinding()), - Pair("pulsar", PulsarChannelBindingTest().build()), + Pair("pulsar", PulsarV0_1_0Test.channelBinding()), Pair("redis", RedisChannelBinding()), Pair("sns", SNSChannelBinding()), Pair("solace", SolaceChannelBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 41ad0112..164ca374 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest +import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider class ChannelItemTest: SerDeTest() { @@ -56,7 +56,7 @@ class ChannelItemTest: SerDeTest() { Pair("mqtt", Reference("#/components/channelBindings/mqtt")), Pair("mqtt5", Reference("#/components/channelBindings/mqtt5")), Pair("nats", Reference("#/components/channelBindings/nats")), - Pair("pulsar", PulsarChannelBindingTest().build()), + Pair("pulsar", PulsarV0_1_0Test.channelBinding()), Pair("redis", Reference("#/components/channelBindings/redis")), Pair("sns", Reference("#/components/channelBindings/sns")), Pair("solace", Reference("#/components/channelBindings/solace")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index ebff0c15..a93059e3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest -import com.asyncapi.bindings.pulsar.v0._1_0.channel.PulsarChannelBindingTest +import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider class ChannelTest: SerDeTest() { @@ -76,7 +76,7 @@ class ChannelTest: SerDeTest() { Pair("mqtt", Reference("#/components/channelBindings/mqtt")), Pair("mqtt5", Reference("#/components/channelBindings/mqtt5")), Pair("nats", Reference("#/components/channelBindings/nats")), - Pair("pulsar", PulsarChannelBindingTest().build()), + Pair("pulsar", PulsarV0_1_0Test.channelBinding()), Pair("redis", Reference("#/components/channelBindings/redis")), Pair("sns", Reference("#/components/channelBindings/sns")), Pair("solace", Reference("#/components/channelBindings/solace")), @@ -149,7 +149,7 @@ class ChannelTestWithReference: SerDeTest() { Pair("mqtt", Reference("#/components/channelBindings/mqtt")), Pair("mqtt5", Reference("#/components/channelBindings/mqtt5")), Pair("nats", Reference("#/components/channelBindings/nats")), - Pair("pulsar", PulsarChannelBindingTest().build()), + Pair("pulsar", PulsarV0_1_0Test.channelBinding()), Pair("redis", Reference("#/components/channelBindings/redis")), Pair("sns", Reference("#/components/channelBindings/sns")), Pair("solace", Reference("#/components/channelBindings/solace")), diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/pulsar/channel/pulsarChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding.json b/asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/pulsar/server/pulsarServerBinding.json rename to asyncapi-core/src/test/resources/bindings/pulsar/0.1.0/server/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding - extended.json new file mode 100644 index 00000000..77511187 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.1.0", + "namespace" : "staging", + "persistence" : "persistent", + "compaction" : 1000, + "geo-replication" : [ "us-east1", "us-west1" ], + "retention" : { + "time" : 7, + "size" : 1000 + }, + "ttl" : 360, + "deduplication" : false, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..24ba9aa8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "namespace": "staging", + "persistence": "persistent", + "compaction": 1000, + "geo-replication": [ + "us-east1", + "us-west1" + ], + "retention": { + "time": 7, + "size": 1000 + }, + "ttl": 360, + "deduplication": false, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding.json new file mode 100644 index 00000000..b0f63fd5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/channel/binding.json @@ -0,0 +1,16 @@ +{ + "namespace": "staging", + "persistence": "persistent", + "compaction": 1000, + "geo-replication": [ + "us-east1", + "us-west1" + ], + "retention": { + "time": 7, + "size": 1000 + }, + "ttl": 360, + "deduplication": false, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding - extended.json new file mode 100644 index 00000000..c329a6b5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.1.0", + "tenant" : "contoso", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..909235ec --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "tenant": "contoso", + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding.json new file mode 100644 index 00000000..e6faa846 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/latest/server/binding.json @@ -0,0 +1,4 @@ +{ + "tenant": "contoso", + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..77511187 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.1.0", + "namespace" : "staging", + "persistence" : "persistent", + "compaction" : 1000, + "geo-replication" : [ "us-east1", "us-west1" ], + "retention" : { + "time" : 7, + "size" : 1000 + }, + "ttl" : 360, + "deduplication" : false, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..d9add732 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "namespace": "staging", + "persistence": "persistent", + "compaction": 1000, + "geo-replication": [ + "us-east1", + "us-west1" + ], + "retention": { + "time": 7, + "size": 1000 + }, + "ttl": 360, + "deduplication": false, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding.json new file mode 100644 index 00000000..deb124a9 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/channel/binding.json @@ -0,0 +1,16 @@ +{ + "namespace": "staging", + "persistence": "persistent", + "compaction": 1000, + "geo-replication": [ + "us-east1", + "us-west1" + ], + "retention": { + "time": 7, + "size": 1000 + }, + "ttl": 360, + "deduplication": false, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding - extended.json new file mode 100644 index 00000000..c329a6b5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.1.0", + "tenant" : "contoso", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..dcd0974e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "tenant": "contoso", + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding.json new file mode 100644 index 00000000..16f5faaf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/unknown version/server/binding.json @@ -0,0 +1,4 @@ +{ + "tenant": "contoso", + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - extended.json new file mode 100644 index 00000000..77511187 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.1.0", + "namespace" : "staging", + "persistence" : "persistent", + "compaction" : 1000, + "geo-replication" : [ "us-east1", "us-west1" ], + "retention" : { + "time" : 7, + "size" : 1000 + }, + "ttl" : 360, + "deduplication" : false, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..fda22968 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "namespace": "staging", + "persistence": "persistent", + "compaction": 1000, + "geo-replication": [ + "us-east1", + "us-west1" + ], + "retention": { + "time": 7, + "size": 1000 + }, + "ttl": 360, + "deduplication": false, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding.json new file mode 100644 index 00000000..d78ebc71 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding.json @@ -0,0 +1,16 @@ +{ + "namespace": "staging", + "persistence": "persistent", + "compaction": 1000, + "geo-replication": [ + "us-east1", + "us-west1" + ], + "retention": { + "time": 7, + "size": 1000 + }, + "ttl": 360, + "deduplication": false, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - extended.json new file mode 100644 index 00000000..c329a6b5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.1.0", + "tenant" : "contoso", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..3141ac40 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "tenant": "contoso", + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding.json new file mode 100644 index 00000000..10521b8c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding.json @@ -0,0 +1,4 @@ +{ + "tenant": "contoso", + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 6ab1e794..2a8c4988 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -198,7 +198,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -322,7 +324,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -449,7 +453,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -573,7 +579,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -728,7 +736,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -1047,7 +1057,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -1279,7 +1291,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -1425,7 +1439,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -1723,7 +1739,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -1831,7 +1849,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index d1d18312..2d5e47bf 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -85,7 +85,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -209,7 +211,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -336,7 +340,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -460,7 +466,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -615,7 +623,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index d5e03b9b..723de7cc 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -115,7 +115,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 35275db7..1ca796fa 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -104,7 +104,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 1750b91a..ee9af628 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -83,7 +83,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -207,7 +209,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -362,7 +366,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index ef247471..f042d720 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -83,7 +83,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -207,7 +209,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 4112deb7..76c89de9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -83,7 +83,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 27fbcd1c..57f2904d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -146,7 +146,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -378,7 +380,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -524,7 +528,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -822,7 +828,9 @@ "bindingVersion" : "0.1.0", "queue" : "messages" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, @@ -930,7 +938,9 @@ "nats" : { "bindingVersion" : "0.1.0" }, - "pulsar" : { }, + "pulsar" : { + "bindingVersion" : "0.1.0" + }, "redis" : { "bindingVersion" : "0.1.0" }, From 1383ad7a709e1abd9b9268bf3b2a4adbc1300e3b Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 29 Apr 2024 21:51:30 +0400 Subject: [PATCH 050/141] tests(bindings): SQS 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/181 --- .../bindings/sqs/SQSChannelBinding.java | 33 +++++++++ .../bindings/sqs/SQSMessageBinding.java | 33 +++++++++ .../bindings/sqs/SQSOperationBinding.java | 33 +++++++++ .../bindings/sqs/SQSServerBinding.java | 33 +++++++++ .../v0/_1_0/channel/SQSChannelBinding.java | 14 +++- .../v0/_1_0/message/SQSMessageBinding.java | 14 +++- .../_1_0/operation/SQSOperationBinding.java | 14 +++- .../sqs/v0/_1_0/server/SQSServerBinding.java | 14 +++- .../kotlin/com/asyncapi/bindings/sqs/SQS.java | 11 +++ .../asyncapi/bindings/sqs/SQSLatestTest.java | 54 ++++++++++++++ .../bindings/sqs/SQSUnknownVersionTest.java | 54 ++++++++++++++ .../asyncapi/bindings/sqs/SQSV0_1_0Test.java | 70 +++++++++++++++++++ .../bindings/sqs/SQSWithoutVersionTest.java | 54 ++++++++++++++ .../v2/2.0.0/model/asyncapi - extended.json | 56 +++++++++++---- .../model/channel/channelItem - extended.json | 24 +++++-- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 12 +++- ... with reference to message - extended.json | 8 ++- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 28 ++++++-- .../2.0.0/model/server/server - extended.json | 4 +- .../v2/2.6.0/model/asyncapi - extended.json | 12 +++- .../components/components - extended.json | 8 ++- .../2.6.0/model/server/server - extended.json | 4 +- .../v3/3.0.0/model/asyncapi - extended.json | 16 +++-- .../components/components - extended.json | 8 ++- .../3.0.0/model/server/server - extended.json | 4 +- .../server with reference - extended.json | 4 +- 29 files changed, 577 insertions(+), 54 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQS.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSWithoutVersionTest.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java new file mode 100644 index 00000000..a94a7d7b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.sqs; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes SQS channel binding. + * + * @version 0.1.0 + * @see SQS channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class SQSChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java new file mode 100644 index 00000000..d46ae4a8 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.sqs; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes SQS message binding. + * + * @version 0.1.0 + * @see SQS message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class SQSMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java new file mode 100644 index 00000000..0d950ea7 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.sqs; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes SQS operation binding. + * + * @version 0.1.0 + * @see SQS operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class SQSOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java new file mode 100644 index 00000000..f95943f1 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.sqs; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes SQS server binding. + * + * @version 0.1.0 + * @see SQS server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class SQSServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java index 4f79e1c9..2bd39fe8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -19,5 +20,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SQSChannelBinding extends ChannelBinding { +public class SQSChannelBinding extends com.asyncapi.bindings.sqs.SQSChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java index 357c9af6..3e23fc1d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -19,5 +20,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SQSMessageBinding extends MessageBinding { +public class SQSMessageBinding extends com.asyncapi.bindings.sqs.SQSMessageBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java index b47c31e4..e39c810b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -19,5 +20,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SQSOperationBinding extends OperationBinding { +public class SQSOperationBinding extends com.asyncapi.bindings.sqs.SQSOperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java index bfbc27af..5f2e2244 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. @@ -19,5 +20,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SQSServerBinding extends ServerBinding { +public class SQSServerBinding extends com.asyncapi.bindings.sqs.SQSServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQS.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQS.java new file mode 100644 index 00000000..07765c2f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQS.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.sqs; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("SQS") +@SelectPackages("com.asyncapi.bindings.sqs") +public class SQS { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSLatestTest.java new file mode 100644 index 00000000..e032e1e5 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.sqs; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class SQSLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = SQSV0_1_0Test.channelBinding(); + super.bindingTypeClass = SQSChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = SQSV0_1_0Test.messageBinding(); + super.bindingTypeClass = SQSMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = SQSV0_1_0Test.operationBinding(); + super.bindingTypeClass = SQSOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = SQSV0_1_0Test.serverBinding(); + super.bindingTypeClass = SQSServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSUnknownVersionTest.java new file mode 100644 index 00000000..5cb3a0f2 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.sqs; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class SQSUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = SQSV0_1_0Test.channelBinding(); + super.bindingTypeClass = SQSChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = SQSV0_1_0Test.messageBinding(); + super.bindingTypeClass = SQSMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = SQSV0_1_0Test.operationBinding(); + super.bindingTypeClass = SQSOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = SQSV0_1_0Test.serverBinding(); + super.bindingTypeClass = SQSServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_1_0Test.java new file mode 100644 index 00000000..e47c2432 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_1_0Test.java @@ -0,0 +1,70 @@ +package com.asyncapi.bindings.sqs; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class SQSV0_1_0Test { + + public static SQSChannelBinding channelBinding () { + return new SQSChannelBinding(); + } + + public static SQSMessageBinding messageBinding () { + return new SQSMessageBinding(); + } + + public static SQSOperationBinding operationBinding () { + return new SQSOperationBinding(); + } + + public static SQSServerBinding serverBinding () { + return new SQSServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = SQSChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = SQSMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = SQSOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = SQSServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSWithoutVersionTest.java new file mode 100644 index 00000000..a5c1a445 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.sqs; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class SQSWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = SQSV0_1_0Test.channelBinding(); + super.bindingTypeClass = SQSChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = SQSV0_1_0Test.messageBinding(); + super.bindingTypeClass = SQSMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = SQSV0_1_0Test.operationBinding(); + super.bindingTypeClass = SQSOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = SQSV0_1_0Test.serverBinding(); + super.bindingTypeClass = SQSServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 2a8c4988..035156e1 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -100,7 +100,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -229,7 +231,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -355,7 +359,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -484,7 +490,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -610,7 +618,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -744,7 +754,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -880,7 +892,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -1065,7 +1079,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -1322,7 +1338,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -1447,7 +1465,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -1535,7 +1555,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -1643,7 +1665,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -1770,7 +1794,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -1857,7 +1883,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 2d5e47bf..e8579878 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -116,7 +116,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -242,7 +244,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -371,7 +375,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -497,7 +503,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -631,7 +639,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -767,7 +777,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 723de7cc..e1edcba2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -123,7 +123,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 1ca796fa..5168a295 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -112,7 +112,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index ee9af628..07269a93 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -114,7 +114,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -240,7 +242,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -374,7 +378,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index f042d720..b50d9d12 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -114,7 +114,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -240,7 +242,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 76c89de9..d3fe0a51 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -114,7 +114,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 57f2904d..6f5f8a77 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -154,7 +154,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -411,7 +413,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -536,7 +540,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -624,7 +630,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -732,7 +740,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -859,7 +869,9 @@ } } ] }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -946,7 +958,9 @@ }, "sns" : { }, "solace" : { }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index de061ec3..1c9f2b27 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -80,7 +80,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 3718c9cb..27bf17c8 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -109,7 +109,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -1266,7 +1268,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -2956,7 +2960,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 77b9dc0d..7edd8f43 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -121,7 +121,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -1811,7 +1813,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 921af807..fc3f4597 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -90,7 +90,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 5b49bc37..1d9c713e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -136,7 +136,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -254,7 +256,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -5154,7 +5158,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -12619,7 +12625,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index ea87c302..f458158d 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -138,7 +138,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, @@ -7603,7 +7605,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 7792b7bb..5b1ca31f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -104,7 +104,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 0c6eb07f..0dd5c791 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -107,7 +107,9 @@ "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" }, - "sqs" : { }, + "sqs" : { + "bindingVersion" : "0.1.0" + }, "stomp" : { "bindingVersion" : "0.1.0" }, From f9a0220451bae90f426a3284010d9887b5d28186 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 29 Apr 2024 21:55:01 +0400 Subject: [PATCH 051/141] feat(bindings): all parent classes must be abstract https://github.com/asyncapi/jasyncapi/issues/184 --- .../asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java | 2 +- .../asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java | 2 +- .../bindings/anypointmq/AnypointMQOperationBinding.java | 2 +- .../asyncapi/bindings/anypointmq/AnypointMQServerBinding.java | 2 +- .../bindings/googlepubsub/GooglePubSubChannelBinding.java | 2 +- .../bindings/googlepubsub/GooglePubSubMessageBinding.java | 2 +- .../bindings/googlepubsub/GooglePubSubOperationBinding.java | 2 +- .../bindings/googlepubsub/GooglePubSubServerBinding.java | 2 +- .../java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java | 2 +- .../java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java | 2 +- .../java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java | 2 +- .../java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java | 2 +- .../main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java | 2 +- .../main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java | 2 +- .../java/com/asyncapi/bindings/jms/JMSOperationBinding.java | 2 +- .../main/java/com/asyncapi/bindings/jms/JMSServerBinding.java | 2 +- .../com/asyncapi/bindings/mercure/MercureChannelBinding.java | 2 +- .../com/asyncapi/bindings/mercure/MercureMessageBinding.java | 2 +- .../com/asyncapi/bindings/mercure/MercureOperationBinding.java | 2 +- .../com/asyncapi/bindings/mercure/MercureServerBinding.java | 2 +- .../java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java | 2 +- .../java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java | 2 +- .../com/asyncapi/bindings/pulsar/PulsarOperationBinding.java | 2 +- .../java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java | 2 +- .../main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java | 2 +- .../main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java | 2 +- .../java/com/asyncapi/bindings/sqs/SQSOperationBinding.java | 2 +- .../main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java index 060b1b93..afc70c96 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java @@ -26,4 +26,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class AnypointMQChannelBinding extends ChannelBinding {} \ No newline at end of file +public abstract class AnypointMQChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java index c928ae26..5fc1c6e5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java @@ -27,4 +27,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class AnypointMQMessageBinding extends MessageBinding {} \ No newline at end of file +public abstract class AnypointMQMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java index 4b6b7adb..69e6ffba 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class AnypointMQOperationBinding extends OperationBinding {} \ No newline at end of file +public abstract class AnypointMQOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java index 85943a0d..2adf1caa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class AnypointMQServerBinding extends ServerBinding {} \ No newline at end of file +public abstract class AnypointMQServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java index b7e117cf..75bbfaf9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java @@ -27,4 +27,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class GooglePubSubChannelBinding extends ChannelBinding {} \ No newline at end of file +public abstract class GooglePubSubChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java index b93ce35e..804266d1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java @@ -29,4 +29,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class GooglePubSubMessageBinding extends MessageBinding {} \ No newline at end of file +public abstract class GooglePubSubMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java index 5501bdd0..3a1ae8ff 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java @@ -26,4 +26,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class GooglePubSubOperationBinding extends OperationBinding {} \ No newline at end of file +public abstract class GooglePubSubOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java index facb4ebc..2548be44 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java @@ -26,4 +26,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class GooglePubSubServerBinding extends ServerBinding {} \ No newline at end of file +public abstract class GooglePubSubServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java index 40dbc2c7..e4833d8f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class IBMMQChannelBinding extends ChannelBinding {} \ No newline at end of file +public abstract class IBMMQChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java index 81a29d91..a857b17a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class IBMMQMessageBinding extends MessageBinding {} \ No newline at end of file +public abstract class IBMMQMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java index a6fd25f1..96cb287c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class IBMMQOperationBinding extends OperationBinding {} \ No newline at end of file +public abstract class IBMMQOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java index f840543d..38ed19db 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java @@ -29,4 +29,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class IBMMQServerBinding extends ServerBinding {} \ No newline at end of file +public abstract class IBMMQServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java index 6ecfe726..3191dee9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class JMSChannelBinding extends ChannelBinding {} \ No newline at end of file +public abstract class JMSChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java index b0b098f2..312e5092 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class JMSMessageBinding extends MessageBinding {} \ No newline at end of file +public abstract class JMSMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java index 4581e184..875dfe00 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class JMSOperationBinding extends OperationBinding {} \ No newline at end of file +public abstract class JMSOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java index 3fb59c6b..5a9d5936 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class JMSServerBinding extends ServerBinding {} \ No newline at end of file +public abstract class JMSServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java index 0dd521f8..d717e3d3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java @@ -28,5 +28,5 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class MercureChannelBinding extends ChannelBinding { +public abstract class MercureChannelBinding extends ChannelBinding { } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java index 977c3b54..62c0ae12 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java @@ -28,5 +28,5 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class MercureMessageBinding extends MessageBinding { +public abstract class MercureMessageBinding extends MessageBinding { } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java index 646b84a2..afa8ba18 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java @@ -28,5 +28,5 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class MercureOperationBinding extends OperationBinding { +public abstract class MercureOperationBinding extends OperationBinding { } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java index 67f182c6..f676599d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java @@ -28,5 +28,5 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class MercureServerBinding extends ServerBinding { +public abstract class MercureServerBinding extends ServerBinding { } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java index f85e4e37..d67a7134 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java @@ -26,4 +26,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class PulsarChannelBinding extends ChannelBinding {} \ No newline at end of file +public abstract class PulsarChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java index 9a495626..510466e9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class PulsarMessageBinding extends MessageBinding {} \ No newline at end of file +public abstract class PulsarMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java index 289d1229..4fd2f4ef 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class PulsarOperationBinding extends OperationBinding {} \ No newline at end of file +public abstract class PulsarOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java index 0b164b6d..f1110610 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java @@ -26,4 +26,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class PulsarServerBinding extends ServerBinding {} \ No newline at end of file +public abstract class PulsarServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java index a94a7d7b..b5816775 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java @@ -30,4 +30,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class SQSChannelBinding extends ChannelBinding {} \ No newline at end of file +public abstract class SQSChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java index d46ae4a8..708f5c77 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java @@ -30,4 +30,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class SQSMessageBinding extends MessageBinding {} \ No newline at end of file +public abstract class SQSMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java index 0d950ea7..f3bd5923 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java @@ -30,4 +30,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class SQSOperationBinding extends OperationBinding {} \ No newline at end of file +public abstract class SQSOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java index f95943f1..c4c0141c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java @@ -30,4 +30,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class SQSServerBinding extends ServerBinding {} \ No newline at end of file +public abstract class SQSServerBinding extends ServerBinding {} \ No newline at end of file From 989f5ee47b8b77d3820176ccbcfdc5b4ea670ee0 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 29 Apr 2024 23:14:16 +0400 Subject: [PATCH 052/141] feat(bindings): use parents in serde https://github.com/asyncapi/jasyncapi/issues/184 --- .../asyncapi/bindings/ChannelBindingsDeserializer.java | 10 +++++----- .../asyncapi/bindings/MessageBindingsDeserializer.java | 10 +++++----- .../bindings/OperationBindingsDeserializer.java | 10 +++++----- .../asyncapi/bindings/ServerBindingsDeserializer.java | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 88b3dcbf..f1b2351d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.bindings; import com.asyncapi.bindings.amqp.AMQPChannelBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; +import com.asyncapi.bindings.amqp1.AMQP1ChannelBinding; import com.asyncapi.bindings.anypointmq.AnypointMQChannelBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubChannelBinding; import com.asyncapi.bindings.http.HTTPChannelBinding; @@ -13,12 +13,12 @@ import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.NATSChannelBinding; import com.asyncapi.bindings.pulsar.PulsarChannelBinding; -import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; +import com.asyncapi.bindings.redis.RedisChannelBinding; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; -import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; -import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.sqs.SQSChannelBinding; +import com.asyncapi.bindings.stomp.STOMPChannelBinding; +import com.asyncapi.bindings.websockets.WebSocketsChannelBinding; import com.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 80a0c493..753ab5f4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.bindings; import com.asyncapi.bindings.amqp.AMQPMessageBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; +import com.asyncapi.bindings.amqp1.AMQP1MessageBinding; import com.asyncapi.bindings.anypointmq.AnypointMQMessageBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubMessageBinding; import com.asyncapi.bindings.http.HTTPMessageBinding; @@ -13,12 +13,12 @@ import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; import com.asyncapi.bindings.nats.NATSMessageBinding; import com.asyncapi.bindings.pulsar.PulsarMessageBinding; -import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; +import com.asyncapi.bindings.redis.RedisMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; -import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; -import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; -import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; +import com.asyncapi.bindings.sqs.SQSMessageBinding; +import com.asyncapi.bindings.stomp.STOMPMessageBinding; +import com.asyncapi.bindings.websockets.WebSocketsMessageBinding; import com.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 301314b7..aa1186f9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.bindings; import com.asyncapi.bindings.amqp.AMQPOperationBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; +import com.asyncapi.bindings.amqp1.AMQP1OperationBinding; import com.asyncapi.bindings.anypointmq.AnypointMQOperationBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubOperationBinding; import com.asyncapi.bindings.http.HTTPOperationBinding; @@ -13,12 +13,12 @@ import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; import com.asyncapi.bindings.nats.NATSOperationBinding; import com.asyncapi.bindings.pulsar.PulsarOperationBinding; -import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; +import com.asyncapi.bindings.redis.RedisOperationBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; -import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; -import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; -import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; +import com.asyncapi.bindings.sqs.SQSOperationBinding; +import com.asyncapi.bindings.stomp.STOMPOperationBinding; +import com.asyncapi.bindings.websockets.WebSocketsOperationBinding; import com.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 30da6a62..7b1d549f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.bindings; import com.asyncapi.bindings.amqp.AMQPServerBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; +import com.asyncapi.bindings.amqp1.AMQP1ServerBinding; import com.asyncapi.bindings.anypointmq.AnypointMQServerBinding; import com.asyncapi.bindings.googlepubsub.GooglePubSubServerBinding; import com.asyncapi.bindings.http.HTTPServerBinding; @@ -13,12 +13,12 @@ import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; import com.asyncapi.bindings.nats.NATSServerBinding; import com.asyncapi.bindings.pulsar.PulsarServerBinding; -import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; +import com.asyncapi.bindings.redis.RedisServerBinding; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; -import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; -import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.bindings.sqs.SQSServerBinding; +import com.asyncapi.bindings.stomp.STOMPServerBinding; +import com.asyncapi.bindings.websockets.WebSocketsServerBinding; import com.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; From bcdce21dbf711f066fe668c4ec546360c4196046 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 30 Apr 2024 01:56:26 +0400 Subject: [PATCH 053/141] feat(bindings): Kafka 0.4.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/173 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/kafka/KafkaChannelBinding.java | 29 +++++ .../bindings/kafka/KafkaMessageBinding.java | 31 +++++ .../bindings/kafka/KafkaOperationBinding.java | 31 +++++ .../bindings/kafka/KafkaServerBinding.java | 29 +++++ .../v0/_4_0/channel/KafkaChannelBinding.java | 18 +-- .../v0/_4_0/message/KafkaMessageBinding.java | 20 ++-- .../_4_0/operation/KafkaOperationBinding.java | 18 +-- .../v0/_4_0/server/KafkaServerBinding.java | 20 ++-- .../com/asyncapi/bindings/kafka/Kafka.java | 11 ++ .../bindings/kafka/KafkaLatestTest.java | 54 +++++++++ .../kafka/KafkaUnknownVersionTest.java | 54 +++++++++ .../bindings/kafka/KafkaV0_4_0Test.java | 112 ++++++++++++++++++ .../kafka/KafkaWithoutVersionTest.java | 54 +++++++++ .../_4_0/channel/KafkaChannelBindingTest.kt | 38 ------ .../_4_0/message/KafkaMessageBindingTest.kt | 29 ----- .../operation/KafkaOperationBindingTest.kt | 30 ----- .../v0/_4_0/server/KafkaServerBindingTest.kt | 26 ---- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v3/_0_0/model/channel/ChannelTest.kt | 6 +- .../_0_0/model/channel/message/MessageTest.kt | 8 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../v3/_0_0/model/operation/OperationTest.kt | 6 +- .../model/operation/OperationTraitTest.kt | 6 +- .../channel/binding - extended.json} | 0 .../channel/binding - wrongly extended.json} | 0 .../channel/binding.json} | 0 .../message/binding - extended.json} | 0 .../message/binding - wrongly extended.json} | 0 .../message/binding.json} | 0 .../operation/binding - extended.json} | 0 .../binding - wrongly extended.json} | 0 .../operation/binding.json} | 0 .../server/binding - extended.json} | 0 .../server/binding - wrongly extended.json} | 0 .../server/binding.json} | 0 .../latest/channel/binding - extended.json | 18 +++ .../channel/binding - wrongly extended.json | 22 ++++ .../kafka/latest/channel/binding.json | 16 +++ .../latest/message/binding - extended.json | 15 +++ .../message/binding - wrongly extended.json | 18 +++ .../kafka/latest/message/binding.json | 12 ++ .../latest/operation/binding - extended.json | 16 +++ .../operation/binding - wrongly extended.json | 21 ++++ .../kafka/latest/operation/binding.json | 15 +++ .../latest/server/binding - extended.json | 10 ++ .../server/binding - wrongly extended.json | 11 ++ .../bindings/kafka/latest/server/binding.json | 5 + .../channel/binding - extended.json | 18 +++ .../channel/binding - wrongly extended.json | 22 ++++ .../unknown version/channel/binding.json | 16 +++ .../message/binding - extended.json | 15 +++ .../message/binding - wrongly extended.json | 18 +++ .../unknown version/message/binding.json | 12 ++ .../operation/binding - extended.json | 16 +++ .../operation/binding - wrongly extended.json | 21 ++++ .../unknown version/operation/binding.json | 15 +++ .../server/binding - extended.json | 10 ++ .../server/binding - wrongly extended.json | 11 ++ .../kafka/unknown version/server/binding.json | 5 + .../channel/binding - extended.json | 18 +++ .../channel/binding - wrongly extended.json | 22 ++++ .../without version/channel/binding.json | 16 +++ .../message/binding - extended.json | 15 +++ .../message/binding - wrongly extended.json | 18 +++ .../without version/message/binding.json | 12 ++ .../operation/binding - extended.json | 16 +++ .../operation/binding - wrongly extended.json | 21 ++++ .../without version/operation/binding.json | 15 +++ .../server/binding - extended.json | 10 ++ .../server/binding - wrongly extended.json | 11 ++ .../kafka/without version/server/binding.json | 5 + 84 files changed, 1023 insertions(+), 200 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/Kafka.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt rename asyncapi-core/src/test/resources/bindings/kafka/{channel/kafkaChannelBinding - extended.json => 0.4.0/channel/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{channel/kafkaChannelBinding - wrongly extended.json => 0.4.0/channel/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{channel/kafkaChannelBinding.json => 0.4.0/channel/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{message/kafkaMessageBinding - extended.json => 0.4.0/message/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{message/kafkaMessageBinding - wrongly extended.json => 0.4.0/message/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{message/kafkaMessageBinding.json => 0.4.0/message/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{operation/kafkaOperationBinding - extended.json => 0.4.0/operation/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{operation/kafkaOperationBinding - wrongly extended.json => 0.4.0/operation/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{operation/kafkaOperationBinding.json => 0.4.0/operation/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{server/kafkaServerBinding - extended.json => 0.4.0/server/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{server/kafkaServerBinding - wrongly extended.json => 0.4.0/server/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/kafka/{server/kafkaServerBinding.json => 0.4.0/server/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index f1b2351d..7f089304 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.http.HTTPChannelBinding; import com.asyncapi.bindings.ibmmq.IBMMQChannelBinding; import com.asyncapi.bindings.jms.JMSChannelBinding; -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.KafkaChannelBinding; import com.asyncapi.bindings.mercure.MercureChannelBinding; import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 753ab5f4..7f3704d6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.http.HTTPMessageBinding; import com.asyncapi.bindings.ibmmq.IBMMQMessageBinding; import com.asyncapi.bindings.jms.JMSMessageBinding; -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.KafkaMessageBinding; import com.asyncapi.bindings.mercure.MercureMessageBinding; import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index aa1186f9..d9fba36d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.http.HTTPOperationBinding; import com.asyncapi.bindings.ibmmq.IBMMQOperationBinding; import com.asyncapi.bindings.jms.JMSOperationBinding; -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.KafkaOperationBinding; import com.asyncapi.bindings.mercure.MercureOperationBinding; import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 7b1d549f..e79911b5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.http.HTTPServerBinding; import com.asyncapi.bindings.ibmmq.IBMMQServerBinding; import com.asyncapi.bindings.jms.JMSServerBinding; -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import com.asyncapi.bindings.kafka.KafkaServerBinding; import com.asyncapi.bindings.mercure.MercureServerBinding; import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java new file mode 100644 index 00000000..d393393a --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java @@ -0,0 +1,29 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Kafka channel binding. + * + * @version 0.4.0 + * @see Kafka channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding.class, names = { + "0.4.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class KafkaChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java new file mode 100644 index 00000000..7f231b72 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Kafka message binding. + *

+ * Contains information about the message representation in Kafka. + * + * @version 0.1.0 + * @see Kafka message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding.class, names = { + "0.4.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class KafkaMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java new file mode 100644 index 00000000..c4a3b8bf --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Kafka operation binding. + *

+ * Contains information about the operation representation in Kafka. + * + * @version 0.1.0 + * @see Kafka operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding.class, names = { + "0.4.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class KafkaOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java new file mode 100644 index 00000000..ae03fc20 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java @@ -0,0 +1,29 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes Kafka server binding. + * + * @version 0.4.0 + * @see Kafka server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding.class, names = { + "0.4.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public class KafkaServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java index 9b6b2909..e0e9d6db 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.kafka.v0._4_0.channel; -import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -20,7 +19,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Kafka channel binding.") -public class KafkaChannelBinding extends ChannelBinding { +public class KafkaChannelBinding extends com.asyncapi.bindings.kafka.KafkaChannelBinding { /** * Kafka topic name if different from channel name. @@ -66,11 +65,14 @@ public class KafkaChannelBinding extends ChannelBinding { @JsonPropertyDescription("Topic configuration properties that are relevant for the API.") private KafkaChannelTopicConfiguration topicConfiguration; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - private String bindingVersion = "0.4.0"; + @Override + public String getBindingVersion() { + return "0.4.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.4.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java index cc3d7633..5e2b22ad 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.kafka.v0._4_0.message; -import com.asyncapi.bindings.MessageBinding; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -21,7 +20,7 @@ @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class KafkaMessageBinding extends MessageBinding { +public class KafkaMessageBinding extends com.asyncapi.bindings.kafka.KafkaMessageBinding { /** * The message key. @@ -55,13 +54,14 @@ public class KafkaMessageBinding extends MessageBinding { @JsonPropertyDescription("Freeform string for any naming strategy class to use. Clients should default to the vendor default if not supplied.") private String schemaLookupStrategy; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.4.0"; + @Override + public String getBindingVersion() { + return "0.4.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.4.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java index 74999426..c2a91203 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.kafka.v0._4_0.operation; -import com.asyncapi.bindings.OperationBinding; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -21,7 +20,7 @@ @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class KafkaOperationBinding extends OperationBinding { +public class KafkaOperationBinding extends com.asyncapi.bindings.kafka.KafkaOperationBinding { /** * Id of the consumer group. @@ -39,11 +38,14 @@ public class KafkaOperationBinding extends OperationBinding { @JsonPropertyDescription("Id of the consumer inside a consumer group.") private AsyncAPISchema clientId; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - private String bindingVersion = "0.4.0"; + @Override + public String getBindingVersion() { + return "0.4.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.4.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java index 1e9fd2d6..6fa12d1d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.kafka.v0._4_0.server; -import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -20,7 +19,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Kafka server binding.") -public class KafkaServerBinding extends ServerBinding { +public class KafkaServerBinding extends com.asyncapi.bindings.kafka.KafkaServerBinding { /** * API URL for the Schema Registry used when producing Kafka messages (if a Schema Registry was used) @@ -40,13 +39,14 @@ public class KafkaServerBinding extends ServerBinding { @JsonPropertyDescription("The vendor of Schema Registry and Kafka serdes library that should be used (e.g. apicurio, confluent, ibm, or karapace)") private String schemaRegistryVendor; - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.4.0"; + @Override + public String getBindingVersion() { + return "0.4.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.4.0"); + } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/Kafka.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/Kafka.java new file mode 100644 index 00000000..afe6523a --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/Kafka.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.kafka; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("Kafka") +@SelectPackages("com.asyncapi.bindings.kafka") +public class Kafka { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaLatestTest.java new file mode 100644 index 00000000..f119e6d5 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class KafkaLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = KafkaV0_4_0Test.channelBinding(); + super.bindingTypeClass = KafkaChannelBinding.class; + super.pathToBindingJson = "/bindings/kafka/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = KafkaV0_4_0Test.messageBinding(); + super.bindingTypeClass = KafkaMessageBinding.class; + super.pathToBindingJson = "/bindings/kafka/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = KafkaV0_4_0Test.operationBinding(); + super.bindingTypeClass = KafkaOperationBinding.class; + super.pathToBindingJson = "/bindings/kafka/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = KafkaV0_4_0Test.serverBinding(); + super.bindingTypeClass = KafkaServerBinding.class; + super.pathToBindingJson = "/bindings/kafka/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaUnknownVersionTest.java new file mode 100644 index 00000000..290af9e4 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class KafkaUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = KafkaV0_4_0Test.channelBinding(); + super.bindingTypeClass = KafkaChannelBinding.class; + super.pathToBindingJson = "/bindings/kafka/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = KafkaV0_4_0Test.messageBinding(); + super.bindingTypeClass = KafkaMessageBinding.class; + super.pathToBindingJson = "/bindings/kafka/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = KafkaV0_4_0Test.operationBinding(); + super.bindingTypeClass = KafkaOperationBinding.class; + super.pathToBindingJson = "/bindings/kafka/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = KafkaV0_4_0Test.serverBinding(); + super.bindingTypeClass = KafkaServerBinding.class; + super.pathToBindingJson = "/bindings/kafka/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java new file mode 100644 index 00000000..4c6aa382 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java @@ -0,0 +1,112 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicCleanupPolicy; +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguration; +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageSchemaIdLocation; +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.4.0") +public class KafkaV0_4_0Test { + + public static KafkaChannelBinding channelBinding () { + return KafkaChannelBinding.builder() + .topic("my-specific-topic-name") + .partitions(20) + .replicas(3) + .topicConfiguration(KafkaChannelTopicConfiguration.builder() + .cleanupPolicy(List.of( + KafkaChannelTopicCleanupPolicy.DELETE, + KafkaChannelTopicCleanupPolicy.COMPACT + )) + .retentionMs(604_800_000) + .retentionBytes(1_000_000_000) + .deleteRetentionMs(86_400_000) + .maxMessageBytes(1_048_588) + .build() + ) + .build(); + } + + public static KafkaMessageBinding messageBinding () { + return KafkaMessageBinding.builder() + .key(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myKey")) + .build()) + .schemaIdLocation(KafkaMessageSchemaIdLocation.PAYLOAD) + .schemaIdPayloadEncoding("apicurio-new") + .schemaLookupStrategy("TopicIdStrategy") + .build(); + } + + public static KafkaOperationBinding operationBinding () { + return KafkaOperationBinding.builder() + .groupId(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myGroupId")) + .build()) + .clientId(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myClientId")) + .build()) + .build(); + } + + public static KafkaServerBinding serverBinding () { + return KafkaServerBinding.builder() + .schemaRegistryUrl("https://my-schema-registry.com") + .schemaRegistryVendor("confluent") + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = KafkaChannelBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.4.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.4.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.4.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = KafkaMessageBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.4.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.4.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.4.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = KafkaOperationBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.4.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.4.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.4.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = KafkaServerBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.4.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.4.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.4.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaWithoutVersionTest.java new file mode 100644 index 00000000..7ec6cd2f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class KafkaWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = KafkaV0_4_0Test.channelBinding(); + super.bindingTypeClass = KafkaChannelBinding.class; + super.pathToBindingJson = "/bindings/kafka/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = KafkaV0_4_0Test.messageBinding(); + super.bindingTypeClass = KafkaMessageBinding.class; + super.pathToBindingJson = "/bindings/kafka/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = KafkaV0_4_0Test.operationBinding(); + super.bindingTypeClass = KafkaOperationBinding.class; + super.pathToBindingJson = "/bindings/kafka/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = KafkaV0_4_0Test.serverBinding(); + super.bindingTypeClass = KafkaServerBinding.class; + super.pathToBindingJson = "/bindings/kafka/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt deleted file mode 100644 index cd3f1226..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBindingTest.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.asyncapi.bindings.kafka.v0._4_0.channel - -import com.asyncapi.v3.SerDeTest - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class KafkaChannelBindingTest: SerDeTest() { - - override fun objectClass() = KafkaChannelBinding::class.java - - override fun baseObjectJson() = "/bindings/kafka/channel/kafkaChannelBinding.json" - - override fun extendedObjectJson() = "/bindings/kafka/channel/kafkaChannelBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/kafka/channel/kafkaChannelBinding - wrongly extended.json" - - override fun build(): KafkaChannelBinding { - return KafkaChannelBinding.builder() - .topic("my-specific-topic-name") - .partitions(20) - .replicas(3) - .topicConfiguration(KafkaChannelTopicConfiguration.builder() - .cleanupPolicy(listOf( - KafkaChannelTopicCleanupPolicy.DELETE, - KafkaChannelTopicCleanupPolicy.COMPACT - )) - .retentionMs(604_800_000) - .retentionBytes(1_000_000_000) - .deleteRetentionMs(86_400_000) - .maxMessageBytes(1_048_588) - .build() - ) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt deleted file mode 100644 index aa85b32f..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBindingTest.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.asyncapi.bindings.kafka.v0._4_0.message - -import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.Type - -class KafkaMessageBindingTest: SerDeTest() { - - override fun objectClass() = KafkaMessageBinding::class.java - - override fun baseObjectJson() = "/bindings/kafka/message/kafkaMessageBinding.json" - - override fun extendedObjectJson() = "/bindings/kafka/message/kafkaMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/kafka/message/kafkaMessageBinding - wrongly extended.json" - - override fun build(): KafkaMessageBinding { - return KafkaMessageBinding.builder() - .key(AsyncAPISchema.builder() - .type(Type.STRING) - .enumValue(listOf("myKey")) - .build()) - .schemaIdLocation(KafkaMessageSchemaIdLocation.PAYLOAD) - .schemaIdPayloadEncoding("apicurio-new") - .schemaLookupStrategy("TopicIdStrategy") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt deleted file mode 100644 index 9051f184..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBindingTest.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.asyncapi.bindings.kafka.v0._4_0.operation - -import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.Type - -class KafkaOperationBindingTest: SerDeTest() { - - override fun objectClass() = KafkaOperationBinding::class.java - - override fun baseObjectJson() = "/bindings/kafka/operation/kafkaOperationBinding.json" - - override fun extendedObjectJson() = "/bindings/kafka/operation/kafkaOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/kafka/operation/kafkaOperationBinding - wrongly extended.json" - - override fun build(): KafkaOperationBinding { - return KafkaOperationBinding.builder() - .groupId(AsyncAPISchema.builder() - .type(Type.STRING) - .enumValue(listOf("myGroupId")) - .build()) - .clientId(AsyncAPISchema.builder() - .type(Type.STRING) - .enumValue(listOf("myClientId")) - .build()) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt deleted file mode 100644 index 1b14c86c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBindingTest.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.asyncapi.bindings.kafka.v0._4_0.server - -import com.asyncapi.v3.SerDeTest - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class KafkaServerBindingTest: SerDeTest() { - - override fun objectClass() = KafkaServerBinding::class.java - - override fun baseObjectJson() = "/bindings/kafka/server/kafkaServerBinding.json" - - override fun extendedObjectJson() = "/bindings/kafka/server/kafkaServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/kafka/server/kafkaServerBinding - wrongly extended.json" - - override fun build(): KafkaServerBinding { - return KafkaServerBinding.builder() - .schemaRegistryUrl("https://my-schema-registry.com") - .schemaRegistryVendor("confluent") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index db1cdc0b..700932c6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding @@ -62,7 +62,7 @@ class ChannelItemTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.channelBinding()), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", JMSChannelBinding()), - Pair("kafka", KafkaChannelBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.channelBinding()), Pair("mercure", MercureChannelBinding()), Pair("mqtt", MQTTChannelBinding()), Pair("mqtt5", MQTT5ChannelBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 34b9b699..f5dea5b7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding @@ -121,7 +121,7 @@ class MessageTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", JMSMessageBinding()), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", MercureMessageBinding()), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", MQTT5MessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 81ae33c2..bbeae2ad 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding @@ -80,7 +80,7 @@ class MessageTraitTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", JMSMessageBinding()), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", MercureMessageBinding()), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", MQTT5MessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 61f65f50..05de3c5e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding @@ -108,7 +108,7 @@ class OperationTest { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", IBMMQOperationBinding()), Pair("jms", JMSOperationBinding()), - Pair("kafka", KafkaOperationBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", MercureOperationBinding()), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", MQTT5OperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index c43ef157..c4732a17 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding @@ -57,7 +57,7 @@ class OperationTraitTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", IBMMQOperationBinding()), Pair("jms", JMSOperationBinding()), - Pair("kafka", KafkaOperationBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", MercureOperationBinding()), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", MQTT5OperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 164ca374..22655f59 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider @@ -51,7 +51,7 @@ class ChannelItemTest: SerDeTest() { Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", Reference("#/components/channelBindings/jms")), - Pair("kafka", KafkaChannelBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.channelBinding()), Pair("mercure", Reference("#/components/channelBindings/mercure")), Pair("mqtt", Reference("#/components/channelBindings/mqtt")), Pair("mqtt5", Reference("#/components/channelBindings/mqtt5")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index 1c760029..0b751ac8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest class MessageTest: SerDeTest() { @@ -95,7 +95,7 @@ class MessageTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure")), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index f74b63a6..150b956d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest class MessageTraitTest: SerDeTest() { @@ -67,7 +67,7 @@ class MessageTraitTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure")), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index eefe4250..845e85fe 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2._6_0.model.channel.message.MessageTest import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest @@ -143,7 +143,7 @@ class OperationTest { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), - Pair("kafka", KafkaOperationBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure")), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 967ed502..97a0a266 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest @@ -47,7 +47,7 @@ class OperationTraitTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), - Pair("kafka", KafkaOperationBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure")), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index a93059e3..85804602 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider @@ -71,7 +71,7 @@ class ChannelTest: SerDeTest() { Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", Reference("#/components/channelBindings/jms")), - Pair("kafka", KafkaChannelBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.channelBinding()), Pair("mercure", Reference("#/components/channelBindings/mercure")), Pair("mqtt", Reference("#/components/channelBindings/mqtt")), Pair("mqtt5", Reference("#/components/channelBindings/mqtt5")), @@ -144,7 +144,7 @@ class ChannelTestWithReference: SerDeTest() { Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", Reference("#/components/channelBindings/jms")), - Pair("kafka", KafkaChannelBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.channelBinding()), Pair("mercure", Reference("#/components/channelBindings/mercure")), Pair("mqtt", Reference("#/components/channelBindings/mqtt")), Pair("mqtt5", Reference("#/components/channelBindings/mqtt5")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index d6aa3717..aecefccb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema @@ -91,7 +91,7 @@ class MessageTestWithSchema: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure")), Pair("mqtt", MQTTMessageBindingTest().build()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), @@ -144,7 +144,7 @@ class MessageTestWithReference: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), @@ -234,7 +234,7 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index b8238d03..f001e328 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema @@ -66,7 +66,7 @@ class MessageTraitTestWithSchema: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), @@ -121,7 +121,7 @@ class MessageTraitTestWithReference: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), @@ -193,7 +193,7 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), - Pair("kafka", KafkaMessageBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 7d72786a..649b12eb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest @@ -74,7 +74,7 @@ class OperationTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), - Pair("kafka", KafkaOperationBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure")), Pair("mqtt", MQTTOperationBindingTest().build()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), @@ -132,7 +132,7 @@ class OperationTestWithReference: SerDeTest() { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), - Pair("kafka", KafkaOperationBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index e91737c7..7fd79ecd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBindingTest +import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest @@ -54,7 +54,7 @@ class OperationTraitTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), - Pair("kafka", KafkaOperationBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), @@ -114,7 +114,7 @@ class OperationTraitTestWithReference: SerDeTest() { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), Pair("jms", Reference("#/components/operationBindings/jms")), - Pair("kafka", KafkaOperationBindingTest().build()), + Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), diff --git a/asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/channel/kafkaChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/message/kafkaMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/operation/kafkaOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.4.0/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/kafka/server/kafkaServerBinding.json rename to asyncapi-core/src/test/resources/bindings/kafka/0.4.0/server/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - extended.json new file mode 100644 index 00000000..1b79a719 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.4.0", + "topic" : "my-specific-topic-name", + "partitions" : 20, + "replicas" : 3, + "topicConfiguration" : { + "cleanup.policy" : [ "delete", "compact" ], + "retention.ms" : 604800000, + "retention.bytes" : 1000000000, + "delete.retention.ms" : 86400000, + "max.message.bytes" : 1048588 + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..060b9e51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "topic": "my-specific-topic-name", + "partitions": 20, + "replicas": 3, + "topicConfiguration": { + "cleanup.policy": [ + "delete", + "compact" + ], + "retention.ms": 604800000, + "retention.bytes": 1000000000, + "delete.retention.ms": 86400000, + "max.message.bytes": 1048588 + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding.json new file mode 100644 index 00000000..5a58fbc3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding.json @@ -0,0 +1,16 @@ +{ + "topic": "my-specific-topic-name", + "partitions": 20, + "replicas": 3, + "topicConfiguration": { + "cleanup.policy": [ + "delete", + "compact" + ], + "retention.ms": 604800000, + "retention.bytes": 1000000000, + "delete.retention.ms": 86400000, + "max.message.bytes": 1048588 + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - extended.json new file mode 100644 index 00000000..3325c99e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - extended.json @@ -0,0 +1,15 @@ +{ + "bindingVersion" : "0.4.0", + "key" : { + "type" : "string", + "enum" : [ "myKey" ] + }, + "schemaIdLocation" : "payload", + "schemaIdPayloadEncoding" : "apicurio-new", + "schemaLookupStrategy" : "TopicIdStrategy", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..4093226c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding.json new file mode 100644 index 00000000..1d6d2913 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding.json @@ -0,0 +1,12 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - extended.json new file mode 100644 index 00000000..c86580a4 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.4.0", + "groupId" : { + "type" : "string", + "enum" : [ "myGroupId" ] + }, + "clientId" : { + "type" : "string", + "enum" : [ "myClientId" ] + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..b7797ae6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding.json new file mode 100644 index 00000000..72f176d7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding.json @@ -0,0 +1,15 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - extended.json new file mode 100644 index 00000000..a0eb3c82 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.4.0", + "schemaRegistryUrl" : "https://my-schema-registry.com", + "schemaRegistryVendor" : "confluent", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..17f694cc --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding.json new file mode 100644 index 00000000..6bb539a3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding.json @@ -0,0 +1,5 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..1b79a719 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.4.0", + "topic" : "my-specific-topic-name", + "partitions" : 20, + "replicas" : 3, + "topicConfiguration" : { + "cleanup.policy" : [ "delete", "compact" ], + "retention.ms" : 604800000, + "retention.bytes" : 1000000000, + "delete.retention.ms" : 86400000, + "max.message.bytes" : 1048588 + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..de2b2142 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "topic": "my-specific-topic-name", + "partitions": 20, + "replicas": 3, + "topicConfiguration": { + "cleanup.policy": [ + "delete", + "compact" + ], + "retention.ms": 604800000, + "retention.bytes": 1000000000, + "delete.retention.ms": 86400000, + "max.message.bytes": 1048588 + }, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding.json new file mode 100644 index 00000000..61bb7103 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding.json @@ -0,0 +1,16 @@ +{ + "topic": "my-specific-topic-name", + "partitions": 20, + "replicas": 3, + "topicConfiguration": { + "cleanup.policy": [ + "delete", + "compact" + ], + "retention.ms": 604800000, + "retention.bytes": 1000000000, + "delete.retention.ms": 86400000, + "max.message.bytes": 1048588 + }, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - extended.json new file mode 100644 index 00000000..3325c99e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - extended.json @@ -0,0 +1,15 @@ +{ + "bindingVersion" : "0.4.0", + "key" : { + "type" : "string", + "enum" : [ "myKey" ] + }, + "schemaIdLocation" : "payload", + "schemaIdPayloadEncoding" : "apicurio-new", + "schemaLookupStrategy" : "TopicIdStrategy", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..ef27d281 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding.json new file mode 100644 index 00000000..c2b78b4e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding.json @@ -0,0 +1,12 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..c86580a4 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.4.0", + "groupId" : { + "type" : "string", + "enum" : [ "myGroupId" ] + }, + "clientId" : { + "type" : "string", + "enum" : [ "myClientId" ] + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..bf426992 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding.json new file mode 100644 index 00000000..91ba6c98 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding.json @@ -0,0 +1,15 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - extended.json new file mode 100644 index 00000000..a0eb3c82 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.4.0", + "schemaRegistryUrl" : "https://my-schema-registry.com", + "schemaRegistryVendor" : "confluent", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..7ded284f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding.json new file mode 100644 index 00000000..a932b24f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding.json @@ -0,0 +1,5 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - extended.json new file mode 100644 index 00000000..1b79a719 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.4.0", + "topic" : "my-specific-topic-name", + "partitions" : 20, + "replicas" : 3, + "topicConfiguration" : { + "cleanup.policy" : [ "delete", "compact" ], + "retention.ms" : 604800000, + "retention.bytes" : 1000000000, + "delete.retention.ms" : 86400000, + "max.message.bytes" : 1048588 + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..3a85e13d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "topic": "my-specific-topic-name", + "partitions": 20, + "replicas": 3, + "topicConfiguration": { + "cleanup.policy": [ + "delete", + "compact" + ], + "retention.ms": 604800000, + "retention.bytes": 1000000000, + "delete.retention.ms": 86400000, + "max.message.bytes": 1048588 + }, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding.json new file mode 100644 index 00000000..0e34633c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding.json @@ -0,0 +1,16 @@ +{ + "topic": "my-specific-topic-name", + "partitions": 20, + "replicas": 3, + "topicConfiguration": { + "cleanup.policy": [ + "delete", + "compact" + ], + "retention.ms": 604800000, + "retention.bytes": 1000000000, + "delete.retention.ms": 86400000, + "max.message.bytes": 1048588 + }, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - extended.json new file mode 100644 index 00000000..3325c99e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - extended.json @@ -0,0 +1,15 @@ +{ + "bindingVersion" : "0.4.0", + "key" : { + "type" : "string", + "enum" : [ "myKey" ] + }, + "schemaIdLocation" : "payload", + "schemaIdPayloadEncoding" : "apicurio-new", + "schemaLookupStrategy" : "TopicIdStrategy", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..9ca25de8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding.json new file mode 100644 index 00000000..64eef8fa --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding.json @@ -0,0 +1,12 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - extended.json new file mode 100644 index 00000000..c86580a4 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.4.0", + "groupId" : { + "type" : "string", + "enum" : [ "myGroupId" ] + }, + "clientId" : { + "type" : "string", + "enum" : [ "myClientId" ] + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0f039bd9 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding.json new file mode 100644 index 00000000..e11e2a46 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding.json @@ -0,0 +1,15 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - extended.json new file mode 100644 index 00000000..a0eb3c82 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.4.0", + "schemaRegistryUrl" : "https://my-schema-registry.com", + "schemaRegistryVendor" : "confluent", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..cddc4644 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding.json new file mode 100644 index 00000000..7de76a74 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding.json @@ -0,0 +1,5 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "without version" +} \ No newline at end of file From 9e6e2fdfd1acf008a4bef1d7c37291edd8f007a5 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 30 Apr 2024 14:46:09 +0400 Subject: [PATCH 054/141] feat(bindings): MQTT 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/175 --- .../bindings/mqtt/MQTTChannelBinding.java | 14 ++++ .../bindings/mqtt/MQTTMessageBinding.java | 14 ++++ .../bindings/mqtt/MQTTOperationBinding.java | 14 ++++ .../bindings/mqtt/MQTTServerBinding.java | 14 ++++ .../v0/_1_0/channel/MQTTChannelBinding.java | 15 +++- .../v0/_1_0/message/MQTTMessageBinding.java | 21 +++-- .../_1_0/operation/MQTTOperationBinding.java | 22 +++-- .../v0/_1_0/server/MQTTServerBinding.java | 20 ++--- .../com/asyncapi/bindings/mqtt/MQTT.java | 11 +++ .../bindings/mqtt/MQTTLatestTest.java | 54 ++++++++++++ .../bindings/mqtt/MQTTUnknownVersionTest.java | 54 ++++++++++++ .../bindings/mqtt/MQTTV0_1_0Test.java | 84 +++++++++++++++++++ .../bindings/mqtt/MQTTWithoutVersionTest.java | 54 ++++++++++++ .../v0/_1_0/message/MQTTMessageBindingTest.kt | 20 ----- .../operation/MQTTOperationBindingTest.kt | 22 ----- .../v0/_1_0/server/MQTTServerBindingTest.kt | 33 -------- .../_0_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 8 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../v3/_0_0/model/operation/OperationTest.kt | 6 +- .../model/operation/OperationTraitTest.kt | 6 +- .../channel/binding - extended.json} | 0 .../channel/binding - wrongly extended.json} | 0 .../channel/binding.json} | 0 .../0.1.0/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../bindings/mqtt/0.1.0/message/binding.json | 3 + .../operation/binding - extended.json} | 0 .../binding - wrongly extended.json} | 0 .../operation/binding.json} | 0 .../server/binding - extended.json} | 0 .../server/binding - wrongly extended.json} | 0 .../server/binding.json} | 0 .../latest/channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../bindings/mqtt/latest/channel/binding.json | 3 + .../latest/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../bindings/mqtt/latest/message/binding.json | 3 + .../latest/operation/binding - extended.json | 10 +++ .../operation/binding - wrongly extended.json | 11 +++ .../mqtt/latest/operation/binding.json | 5 ++ .../latest/server/binding - extended.json | 17 ++++ .../server/binding - wrongly extended.json | 18 ++++ .../bindings/mqtt/latest/server/binding.json | 12 +++ .../channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../mqtt/unknown version/channel/binding.json | 3 + .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../mqtt/unknown version/message/binding.json | 3 + .../operation/binding - extended.json | 10 +++ .../operation/binding - wrongly extended.json | 11 +++ .../unknown version/operation/binding.json | 5 ++ .../server/binding - extended.json | 17 ++++ .../server/binding - wrongly extended.json | 18 ++++ .../mqtt/unknown version/server/binding.json | 12 +++ .../channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../mqtt/without version/channel/binding.json | 3 + .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../mqtt/without version/message/binding.json | 3 + .../operation/binding - extended.json | 10 +++ .../operation/binding - wrongly extended.json | 11 +++ .../without version/operation/binding.json | 5 ++ .../server/binding - extended.json | 17 ++++ .../server/binding - wrongly extended.json | 18 ++++ .../mqtt/without version/server/binding.json | 12 +++ .../v2/2.0.0/model/asyncapi - extended.json | 8 +- .../model/channel/channelItem - extended.json | 4 +- .../components/components - extended.json | 4 +- 79 files changed, 757 insertions(+), 144 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt rename asyncapi-core/src/test/resources/bindings/mqtt/{message/mqttMessageBinding - extended.json => 0.1.0/channel/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/mqtt/{message/mqttMessageBinding - wrongly extended.json => 0.1.0/channel/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/mqtt/{message/mqttMessageBinding.json => 0.1.0/channel/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding.json rename asyncapi-core/src/test/resources/bindings/mqtt/{operation/mqttOperationBinding - extended.json => 0.1.0/operation/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/mqtt/{operation/mqttOperationBinding - wrongly extended.json => 0.1.0/operation/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/mqtt/{operation/mqttOperationBinding.json => 0.1.0/operation/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/mqtt/{server/mqttServerBinding - extended.json => 0.1.0/server/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/mqtt/{server/mqttServerBinding - wrongly extended.json => 0.1.0/server/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/mqtt/{server/mqttServerBinding.json => 0.1.0/server/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java new file mode 100644 index 00000000..ed1b870d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java @@ -0,0 +1,14 @@ +package com.asyncapi.bindings.mqtt; + +import com.asyncapi.bindings.ChannelBinding; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes MQTT channel binding. + * + * @version 0.1.0 + * @see MQTT channel binding + * @author Pavel Bodiachevskii + */ +public class MQTTChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java new file mode 100644 index 00000000..40850a3f --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java @@ -0,0 +1,14 @@ +package com.asyncapi.bindings.mqtt; + +import com.asyncapi.bindings.MessageBinding; + +/** + * Describes MQTT message binding. + *

+ * Contains information about the message representation in MQTT. + * + * @version 0.1.0 + * @see MQTT message binding + * @author Pavel Bodiachevskii + */ +public class MQTTMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java new file mode 100644 index 00000000..43b6eae6 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java @@ -0,0 +1,14 @@ +package com.asyncapi.bindings.mqtt; + +import com.asyncapi.bindings.OperationBinding; + +/** + * Describes MQTT operation binding. + *

+ * Contains information about the operation representation in MQTT. + * + * @version 0.1.0 + * @see MQTT operation binding + * @author Pavel Bodiachevskii + */ +public class MQTTOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java new file mode 100644 index 00000000..ed7752f8 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java @@ -0,0 +1,14 @@ +package com.asyncapi.bindings.mqtt; + +import com.asyncapi.bindings.ServerBinding; + +/** + * Describes MQTT server binding. + *

+ * Contains information about the server representation in MQTT. + * + * @version 0.1.0 + * @see MQTT server binding + * @author Pavel Bodiachevskii + */ +public class MQTTServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java index b549f503..710704d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.mqtt.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MQTTChannelBinding extends ChannelBinding { +public class MQTTChannelBinding extends com.asyncapi.bindings.mqtt.MQTTChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java index 6f2dbd70..03b3779a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.mqtt.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; @@ -18,17 +17,17 @@ @Data @Builder @NoArgsConstructor -@AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MQTTMessageBinding extends MessageBinding { +public class MQTTMessageBinding extends com.asyncapi.bindings.mqtt.MQTTMessageBinding { - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java index 71f9e322..48c1ea90 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.mqtt.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -22,7 +21,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes MQTT operation binding.") -public class MQTTOperationBinding extends OperationBinding { +public class MQTTOperationBinding extends com.asyncapi.bindings.mqtt.MQTTOperationBinding { /** * Defines how hard the broker/client will try to ensure that a message is received. @@ -53,15 +52,14 @@ public class MQTTOperationBinding extends OperationBinding { @JsonPropertyDescription("Whether the broker should retain the message or not.") private Boolean retain; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - *

- * Applies to: publish, subscribe - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java index efa27de1..2c07dfa8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.mqtt.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -22,7 +21,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes MQTT server binding.") -public class MQTTServerBinding extends ServerBinding { +public class MQTTServerBinding extends com.asyncapi.bindings.mqtt.MQTTServerBinding { /** * The client identifier. @@ -56,13 +55,14 @@ public class MQTTServerBinding extends ServerBinding { @JsonPropertyDescription("Interval in seconds of the longest period of time the broker and the client can endure without sending a message.") private Integer keepAlive; - /** - * The version of this binding. If omitted, "latest" MUST be assumed. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.1.0"; + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java new file mode 100644 index 00000000..21785200 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.mqtt; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("MQTT") +@SelectPackages("com.asyncapi.bindings.mqtt") +public class MQTT { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTLatestTest.java new file mode 100644 index 00000000..a31600b4 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.mqtt; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class MQTTLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = MQTTV0_1_0Test.channelBinding(); + super.bindingTypeClass = MQTTChannelBinding.class; + super.pathToBindingJson = "/bindings/mqtt/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = MQTTV0_1_0Test.messageBinding(); + super.bindingTypeClass = MQTTMessageBinding.class; + super.pathToBindingJson = "/bindings/mqtt/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = MQTTV0_1_0Test.operationBinding(); + super.bindingTypeClass = MQTTOperationBinding.class; + super.pathToBindingJson = "/bindings/mqtt/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = MQTTV0_1_0Test.serverBinding(); + super.bindingTypeClass = MQTTServerBinding.class; + super.pathToBindingJson = "/bindings/mqtt/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTUnknownVersionTest.java new file mode 100644 index 00000000..3cfe19f3 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.mqtt; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class MQTTUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = MQTTV0_1_0Test.channelBinding(); + super.bindingTypeClass = MQTTChannelBinding.class; + super.pathToBindingJson = "/bindings/mqtt/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = MQTTV0_1_0Test.messageBinding(); + super.bindingTypeClass = MQTTMessageBinding.class; + super.pathToBindingJson = "/bindings/mqtt/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = MQTTV0_1_0Test.operationBinding(); + super.bindingTypeClass = MQTTOperationBinding.class; + super.pathToBindingJson = "/bindings/mqtt/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = MQTTV0_1_0Test.serverBinding(); + super.bindingTypeClass = MQTTServerBinding.class; + super.pathToBindingJson = "/bindings/mqtt/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTV0_1_0Test.java new file mode 100644 index 00000000..9baffff1 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTV0_1_0Test.java @@ -0,0 +1,84 @@ +package com.asyncapi.bindings.mqtt; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class MQTTV0_1_0Test { + + public static MQTTChannelBinding channelBinding () { + return new MQTTChannelBinding(); + } + + public static MQTTMessageBinding messageBinding () { + return new MQTTMessageBinding(); + } + + public static MQTTOperationBinding operationBinding () { + return MQTTOperationBinding.builder() + .qos(2) + .retain(true) + .build(); + } + + public static MQTTServerBinding serverBinding () { + return MQTTServerBinding.builder() + .clientId("guest") + .cleanSession(true) + .lastWill(new MQTTServerLastWillConfiguration( + "/last-wills", + 2, + "Guest gone offline.", + false + )) + .keepAlive(60) + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = MQTTChannelBinding.class; + super.pathToBindingJson = "/bindings/mqtt/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = MQTTMessageBinding.class; + super.pathToBindingJson = "/bindings/mqtt/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = MQTTOperationBinding.class; + super.pathToBindingJson = "/bindings/mqtt/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = MQTTServerBinding.class; + super.pathToBindingJson = "/bindings/mqtt/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTWithoutVersionTest.java new file mode 100644 index 00000000..5380ec30 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.mqtt; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class MQTTWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = MQTTV0_1_0Test.channelBinding(); + super.bindingTypeClass = MQTTChannelBinding.class; + super.pathToBindingJson = "/bindings/mqtt/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = MQTTV0_1_0Test.messageBinding(); + super.bindingTypeClass = MQTTMessageBinding.class; + super.pathToBindingJson = "/bindings/mqtt/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = MQTTV0_1_0Test.operationBinding(); + super.bindingTypeClass = MQTTOperationBinding.class; + super.pathToBindingJson = "/bindings/mqtt/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = MQTTV0_1_0Test.serverBinding(); + super.bindingTypeClass = MQTTServerBinding.class; + super.pathToBindingJson = "/bindings/mqtt/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt deleted file mode 100644 index b2c9f47a..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBindingTest.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.asyncapi.bindings.mqtt.v0._1_0.message - -import com.asyncapi.v3.SerDeTest - -class MQTTMessageBindingTest: SerDeTest() { - - override fun objectClass() = MQTTMessageBinding::class.java - - override fun baseObjectJson() = "/bindings/mqtt/message/mqttMessageBinding.json" - - override fun extendedObjectJson() = "/bindings/mqtt/message/mqttMessageBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/mqtt/message/mqttMessageBinding - wrongly extended.json" - - override fun build(): MQTTMessageBinding { - return MQTTMessageBinding.builder() - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt deleted file mode 100644 index a3a71ac9..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBindingTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.asyncapi.bindings.mqtt.v0._1_0.operation - -import com.asyncapi.v3.SerDeTest - -class MQTTOperationBindingTest: SerDeTest() { - - override fun objectClass() = MQTTOperationBinding::class.java - - override fun baseObjectJson() = "/bindings/mqtt/operation/mqttOperationBinding.json" - - override fun extendedObjectJson() = "/bindings/mqtt/operation/mqttOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/mqtt/operation/mqttOperationBinding - wrongly extended.json" - - override fun build(): MQTTOperationBinding { - return MQTTOperationBinding.builder() - .qos(2) - .retain(true) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt deleted file mode 100644 index 9c37f5d5..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBindingTest.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.asyncapi.bindings.mqtt.v0._1_0.server - -import com.asyncapi.v3.SerDeTest - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class MQTTServerBindingTest: SerDeTest() { - - override fun objectClass() = MQTTServerBinding::class.java - - override fun baseObjectJson() = "/bindings/mqtt/server/mqttServerBinding.json" - - override fun extendedObjectJson() = "/bindings/mqtt/server/mqttServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/mqtt/server/mqttServerBinding - wrongly extended.json" - - override fun build(): MQTTServerBinding { - return MQTTServerBinding.builder() - .clientId("guest") - .cleanSession(true) - .lastWill(MQTTServerLastWillConfiguration( - "/last-wills", - 2, - "Guest gone offline.", - false - )) - .keepAlive(60) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index f5dea5b7..d6f39123 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding @@ -123,7 +123,7 @@ class MessageTest: SerDeTest() { Pair("jms", JMSMessageBinding()), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", MercureMessageBinding()), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", MQTT5MessageBinding()), Pair("nats", NATSMessageBinding()), Pair("pulsar", PulsarMessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index bbeae2ad..860ccd83 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding @@ -82,7 +82,7 @@ class MessageTraitTest: SerDeTest() { Pair("jms", JMSMessageBinding()), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", MercureMessageBinding()), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", MQTT5MessageBinding()), Pair("nats", NATSMessageBinding()), Pair("pulsar", PulsarMessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 05de3c5e..53fc15f6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -15,7 +15,7 @@ import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding @@ -110,7 +110,7 @@ class OperationTest { Pair("jms", JMSOperationBinding()), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", MercureOperationBinding()), - Pair("mqtt", MQTTOperationBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", MQTT5OperationBinding()), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", PulsarOperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index c4732a17..eb7d92b3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding @@ -59,7 +59,7 @@ class OperationTraitTest: SerDeTest() { Pair("jms", JMSOperationBinding()), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", MercureOperationBinding()), - Pair("mqtt", MQTTOperationBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", MQTT5OperationBinding()), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", PulsarOperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index 0b751ac8..de84d834 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test class MessageTest: SerDeTest() { @@ -97,7 +97,7 @@ class MessageTest: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure")), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), Pair("pulsar", Reference("#/components/messageBindings/pulsar")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 150b956d..eb674ab3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test class MessageTraitTest: SerDeTest() { @@ -69,7 +69,7 @@ class MessageTraitTest: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure")), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), Pair("pulsar", Reference("#/components/messageBindings/pulsar")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 845e85fe..2a23aab7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest @@ -145,7 +145,7 @@ class OperationTest { Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure")), - Pair("mqtt", MQTTOperationBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 97a0a266..0cb65960 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest @@ -49,7 +49,7 @@ class OperationTraitTest: SerDeTest() { Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure")), - Pair("mqtt", MQTTOperationBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index aecefccb..9a4d60d9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema @@ -93,7 +93,7 @@ class MessageTestWithSchema: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure")), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), Pair("pulsar", Reference("#/components/messageBindings/pulsar")), @@ -148,7 +148,7 @@ class MessageTestWithReference: SerDeTest() { Pair("mercure", Reference("#/components/messageBindings/mercure") ), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), Pair("pulsar", Reference("#/components/messageBindings/pulsar")), @@ -238,7 +238,7 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { Pair("mercure", Reference("#/components/messageBindings/mercure") ), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), Pair("pulsar", Reference("#/components/messageBindings/pulsar")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index f001e328..354966a4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema class MessageTraitTestWithSchema: SerDeTest() { @@ -70,7 +70,7 @@ class MessageTraitTestWithSchema: SerDeTest() { Pair("mercure", Reference("#/components/messageBindings/mercure") ), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), Pair("pulsar", Reference("#/components/messageBindings/pulsar")), @@ -125,7 +125,7 @@ class MessageTraitTestWithReference: SerDeTest() { Pair("mercure", Reference("#/components/messageBindings/mercure") ), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), Pair("pulsar", Reference("#/components/messageBindings/pulsar")), @@ -197,7 +197,7 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { Pair("mercure", Reference("#/components/messageBindings/mercure") ), - Pair("mqtt", MQTTMessageBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), Pair("nats", Reference("#/components/messageBindings/nats")), Pair("pulsar", Reference("#/components/messageBindings/pulsar")), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 649b12eb..4202f800 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest import com.asyncapi.Reference @@ -76,7 +76,7 @@ class OperationTest: SerDeTest() { Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure")), - Pair("mqtt", MQTTOperationBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar")), @@ -136,7 +136,7 @@ class OperationTestWithReference: SerDeTest() { Pair("mercure", Reference("#/components/operationBindings/mercure") ), - Pair("mqtt", MQTTOperationBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 7fd79ecd..a9960a99 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBindingTest +import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest import com.asyncapi.Reference @@ -58,7 +58,7 @@ class OperationTraitTest: SerDeTest() { Pair("mercure", Reference("#/components/operationBindings/mercure") ), - Pair("mqtt", MQTTOperationBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", @@ -118,7 +118,7 @@ class OperationTraitTestWithReference: SerDeTest() { Pair("mercure", Reference("#/components/operationBindings/mercure") ), - Pair("mqtt", MQTTOperationBindingTest().build()), + Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt/message/mqttMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt/operation/mqttOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt/server/mqttServerBinding.json rename to asyncapi-core/src/test/resources/bindings/mqtt/0.1.0/server/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - extended.json new file mode 100644 index 00000000..8a8a7501 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.1.0", + "qos" : 2, + "retain" : true, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..6f223dab --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "qos": 2, + "retain": true, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding.json new file mode 100644 index 00000000..8ac6a05e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding.json @@ -0,0 +1,5 @@ +{ + "qos": 2, + "retain": true, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - extended.json new file mode 100644 index 00000000..88e46702 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.1.0", + "clientId" : "guest", + "cleanSession" : true, + "lastWill" : { + "topic" : "/last-wills", + "qos" : 2, + "message" : "Guest gone offline.", + "retain" : false + }, + "keepAlive" : 60, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..65fd55b9 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "clientId": "guest", + "cleanSession": true, + "lastWill": { + "topic": "/last-wills", + "qos": 2, + "message": "Guest gone offline.", + "retain": false + }, + "keepAlive": 60, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding.json new file mode 100644 index 00000000..649bcbdb --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding.json @@ -0,0 +1,12 @@ +{ + "clientId": "guest", + "cleanSession": true, + "lastWill": { + "topic": "/last-wills", + "qos": 2, + "message": "Guest gone offline.", + "retain": false + }, + "keepAlive": 60, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..8a8a7501 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.1.0", + "qos" : 2, + "retain" : true, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..19ac921d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "qos": 2, + "retain": true, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding.json new file mode 100644 index 00000000..d3a8acdb --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding.json @@ -0,0 +1,5 @@ +{ + "qos": 2, + "retain": true, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - extended.json new file mode 100644 index 00000000..88e46702 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.1.0", + "clientId" : "guest", + "cleanSession" : true, + "lastWill" : { + "topic" : "/last-wills", + "qos" : 2, + "message" : "Guest gone offline.", + "retain" : false + }, + "keepAlive" : 60, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..f2816b4c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "clientId": "guest", + "cleanSession": true, + "lastWill": { + "topic": "/last-wills", + "qos": 2, + "message": "Guest gone offline.", + "retain": false + }, + "keepAlive": 60, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding.json new file mode 100644 index 00000000..1668214d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding.json @@ -0,0 +1,12 @@ +{ + "clientId": "guest", + "cleanSession": true, + "lastWill": { + "topic": "/last-wills", + "qos": 2, + "message": "Guest gone offline.", + "retain": false + }, + "keepAlive": 60, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..7365f2b2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json new file mode 100644 index 00000000..0c27f736 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - extended.json new file mode 100644 index 00000000..8a8a7501 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.1.0", + "qos" : 2, + "retain" : true, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..2d2554ae --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "qos": 2, + "retain": true, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json new file mode 100644 index 00000000..159d6662 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json @@ -0,0 +1,5 @@ +{ + "qos": 2, + "retain": true, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - extended.json new file mode 100644 index 00000000..88e46702 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - extended.json @@ -0,0 +1,17 @@ +{ + "bindingVersion" : "0.1.0", + "clientId" : "guest", + "cleanSession" : true, + "lastWill" : { + "topic" : "/last-wills", + "qos" : 2, + "message" : "Guest gone offline.", + "retain" : false + }, + "keepAlive" : 60, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..80e3b420 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "clientId": "guest", + "cleanSession": true, + "lastWill": { + "topic": "/last-wills", + "qos": 2, + "message": "Guest gone offline.", + "retain": false + }, + "keepAlive": 60, + "bindingVersion": "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json new file mode 100644 index 00000000..714d8d26 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json @@ -0,0 +1,12 @@ +{ + "clientId": "guest", + "cleanSession": true, + "lastWill": { + "topic": "/last-wills", + "qos": 2, + "message": "Guest gone offline.", + "retain": false + }, + "keepAlive": 60, + "bindingVersion": "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 035156e1..f1cb86be 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -869,7 +869,9 @@ "mercure" : { "bindingVersion" : "0.1.0" }, - "mqtt" : { }, + "mqtt" : { + "bindingVersion" : "0.1.0" + }, "mqtt5" : { }, "nats" : { "bindingVersion" : "0.1.0" @@ -1642,7 +1644,9 @@ "mercure" : { "bindingVersion" : "0.1.0" }, - "mqtt" : { }, + "mqtt" : { + "bindingVersion" : "0.1.0" + }, "mqtt5" : { }, "nats" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index e8579878..86c04a6c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -754,7 +754,9 @@ "mercure" : { "bindingVersion" : "0.1.0" }, - "mqtt" : { }, + "mqtt" : { + "bindingVersion" : "0.1.0" + }, "mqtt5" : { }, "nats" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 6f5f8a77..80ec285e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -717,7 +717,9 @@ "mercure" : { "bindingVersion" : "0.1.0" }, - "mqtt" : { }, + "mqtt" : { + "bindingVersion" : "0.1.0" + }, "mqtt5" : { }, "nats" : { "bindingVersion" : "0.1.0" From 5d767dfaa5c690a4faacfcab5bdda0e2ac713f67 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 30 Apr 2024 15:19:05 +0400 Subject: [PATCH 055/141] feat(bindings): MQT5 0.2.0 https://github.com/asyncapi/jasyncapi/issues/184 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/mqtt5/MQTT5ChannelBinding.java | 31 ++++++++ .../bindings/mqtt5/MQTT5MessageBinding.java | 31 ++++++++ .../bindings/mqtt5/MQTT5OperationBinding.java | 31 ++++++++ .../bindings/mqtt5/MQTT5ServerBinding.java | 29 ++++++++ .../v0/_2_0/channel/MQTT5ChannelBinding.java | 15 +++- .../v0/_2_0/message/MQTT5MessageBinding.java | 15 +++- .../_2_0/operation/MQTT5OperationBinding.java | 15 +++- .../v0/_2_0/server/MQTT5ServerBinding.java | 15 ++-- .../com/asyncapi/bindings/mqtt/MQTT.java | 2 +- .../com/asyncapi/bindings/mqtt5/MQTT5.java | 11 +++ .../bindings/mqtt5/MQTT5LatestTest.java | 54 ++++++++++++++ .../mqtt5/MQTT5UnknownVersionTest.java | 54 ++++++++++++++ .../bindings/mqtt5/MQTT5V0_2_0Test.java | 72 +++++++++++++++++++ .../mqtt5/MQTT5WithoutVersionTest.java | 54 ++++++++++++++ .../v0/_2_0/server/MQTT5ServerBindingTest.kt | 25 ------- .../0.2.0/channel/binding - extended.json | 8 +++ .../channel/binding - wrongly extended.json | 9 +++ .../bindings/mqtt5/0.2.0/channel/binding.json | 3 + .../0.2.0/message/binding - extended.json | 8 +++ .../message/binding - wrongly extended.json | 9 +++ .../bindings/mqtt5/0.2.0/message/binding.json | 3 + .../0.2.0/operation/binding - extended.json | 8 +++ .../operation/binding - wrongly extended.json | 9 +++ .../mqtt5/0.2.0/operation/binding.json | 3 + .../server/binding - extended.json} | 0 .../server/binding - wrongly extended.json} | 0 .../server/binding.json} | 0 .../latest/channel/binding - extended.json | 8 +++ .../channel/binding - wrongly extended.json | 9 +++ .../mqtt5/latest/channel/binding.json | 3 + .../latest/message/binding - extended.json | 8 +++ .../message/binding - wrongly extended.json | 9 +++ .../mqtt5/latest/message/binding.json | 3 + .../latest/operation/binding - extended.json | 8 +++ .../operation/binding - wrongly extended.json | 9 +++ .../mqtt5/latest/operation/binding.json | 3 + .../latest/server/binding - extended.json | 9 +++ .../server/binding - wrongly extended.json | 10 +++ .../bindings/mqtt5/latest/server/binding.json | 4 ++ .../channel/binding - extended.json | 8 +++ .../channel/binding - wrongly extended.json | 9 +++ .../unknown version/channel/binding.json | 3 + .../message/binding - extended.json | 8 +++ .../message/binding - wrongly extended.json | 9 +++ .../unknown version/message/binding.json | 3 + .../operation/binding - extended.json | 8 +++ .../operation/binding - wrongly extended.json | 9 +++ .../unknown version/operation/binding.json | 3 + .../server/binding - extended.json | 9 +++ .../server/binding - wrongly extended.json | 10 +++ .../mqtt5/unknown version/server/binding.json | 4 ++ .../channel/binding - extended.json | 8 +++ .../channel/binding - wrongly extended.json | 9 +++ .../without version/channel/binding.json | 3 + .../message/binding - extended.json | 8 +++ .../message/binding - wrongly extended.json | 9 +++ .../without version/message/binding.json | 3 + .../operation/binding - extended.json | 8 +++ .../operation/binding - wrongly extended.json | 9 +++ .../without version/operation/binding.json | 3 + .../server/binding - extended.json | 9 +++ .../server/binding - wrongly extended.json | 10 +++ .../mqtt5/without version/server/binding.json | 4 ++ .../v2/2.0.0/model/asyncapi - extended.json | 48 +++++++++---- .../model/channel/channelItem - extended.json | 24 +++++-- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 12 +++- ... with reference to message - extended.json | 8 ++- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 24 +++++-- 75 files changed, 827 insertions(+), 72 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5MessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5OperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5LatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5UnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5V0_2_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5WithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBindingTest.kt create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding.json rename asyncapi-core/src/test/resources/bindings/mqtt5/{server/mqtt5ServerBinding - extended.json => 0.2.0/server/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/mqtt5/{server/mqtt5ServerBinding - wrongly extended.json => 0.2.0/server/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/mqtt5/{server/mqtt5ServerBinding.json => 0.2.0/server/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 7f089304..56c75198 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.bindings.kafka.KafkaChannelBinding; import com.asyncapi.bindings.mercure.MercureChannelBinding; import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; -import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; +import com.asyncapi.bindings.mqtt5.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.NATSChannelBinding; import com.asyncapi.bindings.pulsar.PulsarChannelBinding; import com.asyncapi.bindings.redis.RedisChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 7f3704d6..be2ce0cd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.bindings.kafka.KafkaMessageBinding; import com.asyncapi.bindings.mercure.MercureMessageBinding; import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; -import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; +import com.asyncapi.bindings.mqtt5.MQTT5MessageBinding; import com.asyncapi.bindings.nats.NATSMessageBinding; import com.asyncapi.bindings.pulsar.PulsarMessageBinding; import com.asyncapi.bindings.redis.RedisMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index d9fba36d..391e294e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.bindings.kafka.KafkaOperationBinding; import com.asyncapi.bindings.mercure.MercureOperationBinding; import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; -import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; +import com.asyncapi.bindings.mqtt5.MQTT5OperationBinding; import com.asyncapi.bindings.nats.NATSOperationBinding; import com.asyncapi.bindings.pulsar.PulsarOperationBinding; import com.asyncapi.bindings.redis.RedisOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index e79911b5..71f75aef 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -10,7 +10,7 @@ import com.asyncapi.bindings.kafka.KafkaServerBinding; import com.asyncapi.bindings.mercure.MercureServerBinding; import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; -import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; +import com.asyncapi.bindings.mqtt5.MQTT5ServerBinding; import com.asyncapi.bindings.nats.NATSServerBinding; import com.asyncapi.bindings.pulsar.PulsarServerBinding; import com.asyncapi.bindings.redis.RedisServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ChannelBinding.java new file mode 100644 index 00000000..00d631ed --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ChannelBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.mqtt5; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes MQTT 5 channel binding. + * + * @version 0.2.0 + * @see MQTT 5 channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding.class, names = { + "0.2.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class MQTT5ChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5MessageBinding.java new file mode 100644 index 00000000..b83f565b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5MessageBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.mqtt5; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes MQTT 5 message binding. + * + * @version 0.2.0 + * @see MQTT 5 message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding.class, names = { + "0.2.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class MQTT5MessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5OperationBinding.java new file mode 100644 index 00000000..b58b3c1a --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5OperationBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.mqtt5; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes MQTT 5 operation binding. + * + * @version 0.2.0 + * @see MQTT 5 operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding.class, names = { + "0.2.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class MQTT5OperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ServerBinding.java new file mode 100644 index 00000000..6a8cf52b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ServerBinding.java @@ -0,0 +1,29 @@ +package com.asyncapi.bindings.mqtt5; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; + +/** + * Describes MQTT 5 server binding. + * + * @version 0.2.0 + * @see MQTT 5 server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding.class, names = { + "0.2.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) +public abstract class MQTT5ServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/channel/MQTT5ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/channel/MQTT5ChannelBinding.java index 0e8ce3e0..97b4eb0f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/channel/MQTT5ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/channel/MQTT5ChannelBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.mqtt5.v0._2_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MQTT5ChannelBinding extends ChannelBinding { +public class MQTT5ChannelBinding extends com.asyncapi.bindings.mqtt5.MQTT5ChannelBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/message/MQTT5MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/message/MQTT5MessageBinding.java index 39161990..9b5ead5f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/message/MQTT5MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/message/MQTT5MessageBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.mqtt5.v0._2_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MQTT5MessageBinding extends MessageBinding { +public class MQTT5MessageBinding extends com.asyncapi.bindings.mqtt5.MQTT5MessageBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/operation/MQTT5OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/operation/MQTT5OperationBinding.java index 9f74ddc2..77a272db 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/operation/MQTT5OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/operation/MQTT5OperationBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.mqtt5.v0._2_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MQTT5OperationBinding extends OperationBinding { +public class MQTT5OperationBinding extends com.asyncapi.bindings.mqtt5.MQTT5OperationBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java index d3a27b87..3701febd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java @@ -1,7 +1,7 @@ package com.asyncapi.bindings.mqtt5.v0._2_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.*; +import org.jetbrains.annotations.Nullable; /** * Describes MQTT 5 server binding. @@ -15,7 +15,7 @@ @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class MQTT5ServerBinding extends ServerBinding { +public class MQTT5ServerBinding extends com.asyncapi.bindings.mqtt5.MQTT5ServerBinding { /** * TODO: support reference, Schema object @@ -23,7 +23,14 @@ public class MQTT5ServerBinding extends ServerBinding { */ private int sessionExpiryInterval; - @Builder.Default - private String bindingVersion = "0.2.0"; + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java index 21785200..b271656f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java @@ -5,7 +5,7 @@ import org.junit.platform.suite.api.SuiteDisplayName; @Suite -@SuiteDisplayName("MQTT") +@SuiteDisplayName("MQTT5") @SelectPackages("com.asyncapi.bindings.mqtt") public class MQTT { } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5.java new file mode 100644 index 00000000..d8fb0ab7 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.mqtt5; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("MQTT5") +@SelectPackages("com.asyncapi.bindings.mqtt5") +public class MQTT5 { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5LatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5LatestTest.java new file mode 100644 index 00000000..9efb892e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5LatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.mqtt5; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class MQTT5LatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.channelBinding(); + super.bindingTypeClass = MQTT5ChannelBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.messageBinding(); + super.bindingTypeClass = MQTT5MessageBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.operationBinding(); + super.bindingTypeClass = MQTT5OperationBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.serverBinding(); + super.bindingTypeClass = MQTT5ServerBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5UnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5UnknownVersionTest.java new file mode 100644 index 00000000..e9b1c1d9 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5UnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.mqtt5; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class MQTT5UnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.channelBinding(); + super.bindingTypeClass = MQTT5ChannelBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.messageBinding(); + super.bindingTypeClass = MQTT5MessageBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.operationBinding(); + super.bindingTypeClass = MQTT5OperationBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.serverBinding(); + super.bindingTypeClass = MQTT5ServerBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5V0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5V0_2_0Test.java new file mode 100644 index 00000000..ecbf2216 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5V0_2_0Test.java @@ -0,0 +1,72 @@ +package com.asyncapi.bindings.mqtt5; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.2.0") +public class MQTT5V0_2_0Test { + + public static MQTT5ChannelBinding channelBinding () { + return new MQTT5ChannelBinding(); + } + + public static MQTT5MessageBinding messageBinding () { + return new MQTT5MessageBinding(); + } + + public static MQTT5OperationBinding operationBinding () { + return new MQTT5OperationBinding(); + } + + public static MQTT5ServerBinding serverBinding () { + return MQTT5ServerBinding.builder() + .sessionExpiryInterval(60) + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = MQTT5ChannelBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/0.2.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/0.2.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/0.2.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = MQTT5MessageBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/0.2.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/0.2.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/0.2.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = MQTT5OperationBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/0.2.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/0.2.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/0.2.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = MQTT5ServerBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/0.2.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/0.2.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/0.2.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5WithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5WithoutVersionTest.java new file mode 100644 index 00000000..e42c7e77 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5WithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.mqtt5; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding; +import com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class MQTT5WithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.channelBinding(); + super.bindingTypeClass = MQTT5ChannelBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.messageBinding(); + super.bindingTypeClass = MQTT5MessageBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.operationBinding(); + super.bindingTypeClass = MQTT5OperationBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = MQTT5V0_2_0Test.serverBinding(); + super.bindingTypeClass = MQTT5ServerBinding.class; + super.pathToBindingJson = "/bindings/mqtt5/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt5/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt5/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBindingTest.kt deleted file mode 100644 index d0251ec9..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBindingTest.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.asyncapi.bindings.mqtt5.v0._2_0.server - -import com.asyncapi.v3.SerDeTest - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class MQTT5ServerBindingTest: SerDeTest() { - - override fun objectClass() = MQTT5ServerBinding::class.java - - override fun baseObjectJson() = "/bindings/mqtt5/server/mqtt5ServerBinding.json" - - override fun extendedObjectJson() = "/bindings/mqtt5/server/mqtt5ServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/mqtt5/server/mqtt5ServerBinding - wrongly extended.json" - - override fun build(): MQTT5ServerBinding { - return MQTT5ServerBinding.builder() - .sessionExpiryInterval(60) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/mqtt5/server/mqtt5ServerBinding.json rename to asyncapi-core/src/test/resources/bindings/mqtt5/0.2.0/server/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding - extended.json new file mode 100644 index 00000000..1104cd11 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "sessionExpiryInterval" : 60, + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..40808889 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "sessionExpiryInterval": 60, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding.json new file mode 100644 index 00000000..e61cd53a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/latest/server/binding.json @@ -0,0 +1,4 @@ +{ + "sessionExpiryInterval": 60, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding - extended.json new file mode 100644 index 00000000..1104cd11 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "sessionExpiryInterval" : 60, + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..97f17911 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "sessionExpiryInterval": 60, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding.json new file mode 100644 index 00000000..02fc5dc0 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/unknown version/server/binding.json @@ -0,0 +1,4 @@ +{ + "sessionExpiryInterval": 60, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0dee3264 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding.json new file mode 100644 index 00000000..defc96bf --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - extended.json new file mode 100644 index 00000000..1104cd11 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "sessionExpiryInterval" : 60, + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..97f17911 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "sessionExpiryInterval": 60, + "bindingVersion": "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding.json new file mode 100644 index 00000000..02fc5dc0 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding.json @@ -0,0 +1,4 @@ +{ + "sessionExpiryInterval": 60, + "bindingVersion": "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index f1cb86be..279491f0 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -195,7 +195,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -323,7 +325,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -454,7 +458,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -582,7 +588,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -742,7 +750,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, @@ -872,7 +882,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, @@ -1069,7 +1081,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, @@ -1304,7 +1318,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -1455,7 +1471,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, @@ -1647,7 +1665,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, @@ -1762,7 +1782,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -1875,7 +1897,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 86c04a6c..f7ac405c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -80,7 +80,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -208,7 +210,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -339,7 +343,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -467,7 +473,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -627,7 +635,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, @@ -757,7 +767,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index e1edcba2..9378615c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -111,7 +111,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 5168a295..d1c7b79d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -100,7 +100,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 07269a93..5ea63791 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -78,7 +78,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -206,7 +208,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -366,7 +370,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index b50d9d12..30cb28a8 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -78,7 +78,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -206,7 +208,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index d3fe0a51..60d8522a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -78,7 +78,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 80ec285e..16fa40ed 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -142,7 +142,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, @@ -377,7 +379,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -528,7 +532,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, @@ -720,7 +726,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, @@ -835,7 +843,9 @@ "qos" : 2, "retain" : true }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0", "queue" : "messages" @@ -948,7 +958,9 @@ "mqtt" : { "bindingVersion" : "0.1.0" }, - "mqtt5" : { }, + "mqtt5" : { + "bindingVersion" : "0.2.0" + }, "nats" : { "bindingVersion" : "0.1.0" }, From d203d00f4fd676bcf3376adf76ba5111dfd61878 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 30 Apr 2024 15:34:36 +0400 Subject: [PATCH 056/141] feat(bindings): SNS 0.1.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/179 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/sns/SNSChannelBinding.java | 33 +++++++++ .../bindings/sns/SNSMessageBinding.java | 33 +++++++++ .../bindings/sns/SNSOperationBinding.java | 33 +++++++++ .../bindings/sns/SNSServerBinding.java | 33 +++++++++ .../v0/_1_0/channel/SNSChannelBinding.java | 15 +++- .../v0/_1_0/message/SNSMessageBinding.java | 15 +++- .../_1_0/operation/SNSOperationBinding.java | 15 +++- .../sns/v0/_1_0/server/SNSServerBinding.java | 15 +++- .../kotlin/com/asyncapi/bindings/sns/SNS.java | 11 +++ .../asyncapi/bindings/sns/SNSLatestTest.java | 54 ++++++++++++++ .../bindings/sns/SNSUnknownVersionTest.java | 54 ++++++++++++++ .../asyncapi/bindings/sns/SNSV0_1_0Test.java | 70 +++++++++++++++++++ .../bindings/sns/SNSWithoutVersionTest.java | 54 ++++++++++++++ .../v2/2.0.0/model/asyncapi - extended.json | 56 +++++++++++---- .../model/channel/channelItem - extended.json | 24 +++++-- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 12 +++- ... with reference to message - extended.json | 8 ++- .../operation/operationTrait - extended.json | 4 +- .../components/components - extended.json | 28 ++++++-- .../2.0.0/model/server/server - extended.json | 4 +- .../v2/2.6.0/model/asyncapi - extended.json | 12 +++- .../components/components - extended.json | 8 ++- .../2.6.0/model/server/server - extended.json | 4 +- .../v3/3.0.0/model/asyncapi - extended.json | 16 +++-- .../components/components - extended.json | 8 ++- .../3.0.0/model/server/server - extended.json | 4 +- .../server with reference - extended.json | 4 +- 33 files changed, 581 insertions(+), 62 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNS.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSWithoutVersionTest.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 56c75198..43219ec8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.bindings.nats.NATSChannelBinding; import com.asyncapi.bindings.pulsar.PulsarChannelBinding; import com.asyncapi.bindings.redis.RedisChannelBinding; -import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; +import com.asyncapi.bindings.sns.SNSChannelBinding; import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; import com.asyncapi.bindings.sqs.SQSChannelBinding; import com.asyncapi.bindings.stomp.STOMPChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index be2ce0cd..7e1b1f8b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.bindings.nats.NATSMessageBinding; import com.asyncapi.bindings.pulsar.PulsarMessageBinding; import com.asyncapi.bindings.redis.RedisMessageBinding; -import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; +import com.asyncapi.bindings.sns.SNSMessageBinding; import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; import com.asyncapi.bindings.sqs.SQSMessageBinding; import com.asyncapi.bindings.stomp.STOMPMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 391e294e..d5536db1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.bindings.nats.NATSOperationBinding; import com.asyncapi.bindings.pulsar.PulsarOperationBinding; import com.asyncapi.bindings.redis.RedisOperationBinding; -import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; +import com.asyncapi.bindings.sns.SNSOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; import com.asyncapi.bindings.sqs.SQSOperationBinding; import com.asyncapi.bindings.stomp.STOMPOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 71f75aef..691821a6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -14,7 +14,7 @@ import com.asyncapi.bindings.nats.NATSServerBinding; import com.asyncapi.bindings.pulsar.PulsarServerBinding; import com.asyncapi.bindings.redis.RedisServerBinding; -import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; +import com.asyncapi.bindings.sns.SNSServerBinding; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; import com.asyncapi.bindings.sqs.SQSServerBinding; import com.asyncapi.bindings.stomp.STOMPServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSChannelBinding.java new file mode 100644 index 00000000..b87d8f69 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSChannelBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.sns; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes SNS channel binding. + * + * @version 0.1.0 + * @see SNS channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class SNSChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSMessageBinding.java new file mode 100644 index 00000000..fa8917b3 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSMessageBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.sns; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes SNS message binding. + * + * @version 0.1.0 + * @see SNS message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class SNSMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSOperationBinding.java new file mode 100644 index 00000000..7b3ab5cb --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSOperationBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.sns; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes SNS operation binding. + * + * @version 0.1.0 + * @see SNS operation binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class SNSOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSServerBinding.java new file mode 100644 index 00000000..a806ce4e --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSServerBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.sns; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes SNS server binding. + * + * @version 0.1.0 + * @see SNS server binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class SNSServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java index 1818458c..75545d91 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.sns.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SNSChannelBinding extends ChannelBinding { +public class SNSChannelBinding extends com.asyncapi.bindings.sns.SNSChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java index 5ed888dc..ae446a6e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.sns.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SNSMessageBinding extends MessageBinding { +public class SNSMessageBinding extends com.asyncapi.bindings.sns.SNSMessageBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java index a810ea34..98b5443f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.sns.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SNSOperationBinding extends OperationBinding { +public class SNSOperationBinding extends com.asyncapi.bindings.sns.SNSOperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java index 48e5779e..d51a62d0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java @@ -1,9 +1,9 @@ package com.asyncapi.bindings.sns.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -17,5 +17,16 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SNSServerBinding extends ServerBinding { +public class SNSServerBinding extends com.asyncapi.bindings.sns.SNSServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNS.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNS.java new file mode 100644 index 00000000..d85df17a --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNS.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.sns; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("SNS") +@SelectPackages("com.asyncapi.bindings.sns") +public class SNS { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSLatestTest.java new file mode 100644 index 00000000..fd8ac8f9 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.sns; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; +import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; +import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; +import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class SNSLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = SNSV0_1_0Test.channelBinding(); + super.bindingTypeClass = SNSChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = SNSV0_1_0Test.messageBinding(); + super.bindingTypeClass = SNSMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = SNSV0_1_0Test.operationBinding(); + super.bindingTypeClass = SNSOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = SNSV0_1_0Test.serverBinding(); + super.bindingTypeClass = SNSServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSUnknownVersionTest.java new file mode 100644 index 00000000..c718522d --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.sns; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; +import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; +import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; +import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class SNSUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = SNSV0_1_0Test.channelBinding(); + super.bindingTypeClass = SNSChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = SNSV0_1_0Test.messageBinding(); + super.bindingTypeClass = SNSMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = SNSV0_1_0Test.operationBinding(); + super.bindingTypeClass = SNSOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = SNSV0_1_0Test.serverBinding(); + super.bindingTypeClass = SNSServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSV0_1_0Test.java new file mode 100644 index 00000000..ec06983e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSV0_1_0Test.java @@ -0,0 +1,70 @@ +package com.asyncapi.bindings.sns; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; +import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; +import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; +import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class SNSV0_1_0Test { + + public static SNSChannelBinding channelBinding () { + return new SNSChannelBinding(); + } + + public static SNSMessageBinding messageBinding () { + return new SNSMessageBinding(); + } + + public static SNSOperationBinding operationBinding () { + return new SNSOperationBinding(); + } + + public static SNSServerBinding serverBinding () { + return new SNSServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = SNSChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = SNSMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = SNSOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = SNSServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSWithoutVersionTest.java new file mode 100644 index 00000000..e0a6a332 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.sns; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; +import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; +import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; +import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class SNSWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = SNSV0_1_0Test.channelBinding(); + super.bindingTypeClass = SNSChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = SNSV0_1_0Test.messageBinding(); + super.bindingTypeClass = SNSMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = SNSV0_1_0Test.operationBinding(); + super.bindingTypeClass = SNSOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = SNSV0_1_0Test.serverBinding(); + super.bindingTypeClass = SNSServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 279491f0..e380652b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -95,7 +95,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -208,7 +210,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -338,7 +342,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -471,7 +477,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -601,7 +609,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -762,7 +772,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" @@ -904,7 +916,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" @@ -1093,7 +1107,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" @@ -1331,7 +1347,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -1483,7 +1501,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" @@ -1570,7 +1590,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -1687,7 +1709,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" @@ -1795,7 +1819,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -1909,7 +1935,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index f7ac405c..f095b3b2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -93,7 +93,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -223,7 +225,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -356,7 +360,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -486,7 +492,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -647,7 +655,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" @@ -789,7 +799,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 9378615c..f8518db7 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -123,7 +123,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index d1c7b79d..358b5b6d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -112,7 +112,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 5ea63791..dbb6f21b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -91,7 +91,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -221,7 +223,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -382,7 +386,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index 30cb28a8..b0c92230 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -91,7 +91,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -221,7 +223,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 60d8522a..de86aaa3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -91,7 +91,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 16fa40ed..02d7a79a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -154,7 +154,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" @@ -392,7 +394,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -544,7 +548,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" @@ -631,7 +637,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -748,7 +756,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" @@ -856,7 +866,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "destinations" : [ { @@ -970,7 +982,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { }, "sqs" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index 1c9f2b27..04385680 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -75,7 +75,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 27bf17c8..10a6391e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -104,7 +104,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -1263,7 +1265,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -2955,7 +2959,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 7edd8f43..08854c99 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -116,7 +116,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -1808,7 +1810,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index fc3f4597..4d865242 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -85,7 +85,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 1d9c713e..9ad72d8d 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -131,7 +131,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -251,7 +253,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -5153,7 +5157,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -12620,7 +12626,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index f458158d..71aeae19 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -133,7 +133,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" @@ -7600,7 +7602,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 5b1ca31f..6213946e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -99,7 +99,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 0dd5c791..b76f7484 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -102,7 +102,9 @@ "redis" : { "bindingVersion" : "0.1.0" }, - "sns" : { }, + "sns" : { + "bindingVersion" : "0.1.0" + }, "solace" : { "bindingVersion" : "0.3.0", "msgVpn" : "solace.private.net" From 52d627d11c7070a9bf844edd29dd1639bdfe4427 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 30 Apr 2024 16:40:00 +0400 Subject: [PATCH 057/141] feat(bindings): Solace 0.3.0 https://github.com/asyncapi/jasyncapi/issues/184 https://github.com/asyncapi/jasyncapi/issues/180 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/solace/SolaceChannelBinding.java | 33 ++++++ .../bindings/solace/SolaceMessageBinding.java | 33 ++++++ .../solace/SolaceOperationBinding.java | 33 ++++++ .../bindings/solace/SolaceServerBinding.java | 31 ++++++ .../v0/_3_0/channel/SolaceChannelBinding.java | 15 ++- .../v0/_3_0/message/SolaceMessageBinding.java | 15 ++- .../operation/SolaceOperationBinding.java | 20 ++-- .../v0/_3_0/server/SolaceServerBinding.java | 20 ++-- .../com/asyncapi/bindings/solace/Solace.java | 11 ++ .../bindings/solace/SolaceLatestTest.java | 54 +++++++++ .../solace/SolaceUnknownVersionTest.java | 54 +++++++++ .../bindings/solace/SolaceV0_3_0Test.java | 103 ++++++++++++++++++ .../solace/SolaceWithoutVersionTest.java | 54 +++++++++ .../operation/SolaceOperationBindingTest.kt | 47 -------- .../v0/_3_0/server/SolaceServerBindingTest.kt | 25 ----- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v3/_0_0/model/operation/OperationTest.kt | 6 +- .../model/operation/OperationTraitTest.kt | 6 +- .../0.3.0/channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../solace/0.3.0/channel/binding.json | 3 + .../0.3.0/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../solace/0.3.0/message/binding.json | 3 + .../operation/binding - extended.json} | 0 .../binding - wrongly extended.json} | 0 .../operation/binding.json} | 0 .../server/binding - extended.json} | 0 .../server/binding - wrongly extended.json} | 0 .../server/binding.json} | 0 .../latest/channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../solace/latest/channel/binding.json | 3 + .../latest/message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../solace/latest/message/binding.json | 3 + .../latest/operation/binding - extended.json | 29 +++++ .../operation/binding - wrongly extended.json | 37 +++++++ .../solace/latest/operation/binding.json | 31 ++++++ .../latest/server/binding - extended.json | 9 ++ .../server/binding - wrongly extended.json | 10 ++ .../solace/latest/server/binding.json | 4 + .../channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../unknown version/channel/binding.json | 3 + .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../unknown version/message/binding.json | 3 + .../operation/binding - extended.json | 29 +++++ .../operation/binding - wrongly extended.json | 37 +++++++ .../unknown version/operation/binding.json | 31 ++++++ .../server/binding - extended.json | 9 ++ .../server/binding - wrongly extended.json | 10 ++ .../unknown version/server/binding.json | 4 + .../channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../without version/channel/binding.json | 3 + .../message/binding - extended.json | 8 ++ .../message/binding - wrongly extended.json | 9 ++ .../without version/message/binding.json | 3 + .../operation/binding - extended.json | 29 +++++ .../operation/binding - wrongly extended.json | 37 +++++++ .../without version/operation/binding.json | 31 ++++++ .../server/binding - extended.json | 9 ++ .../server/binding - wrongly extended.json | 10 ++ .../without version/server/binding.json | 4 + .../v2/2.0.0/model/asyncapi - extended.json | 24 +++- .../model/channel/channelItem - extended.json | 8 +- .../channel/message/message - extended.json | 4 +- .../message/messageTrait - extended.json | 4 +- .../operation with message - extended.json | 4 +- .../components/components - extended.json | 16 ++- 79 files changed, 1035 insertions(+), 129 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/Solace.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceLatestTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_3_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding.json rename asyncapi-core/src/test/resources/bindings/solace/{operation/solaceOperationBinding - extended.json => 0.3.0/operation/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/solace/{operation/solaceOperationBinding - wrongly extended.json => 0.3.0/operation/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/solace/{operation/solaceOperationBinding.json => 0.3.0/operation/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/solace/{server/solaceServerBinding - extended.json => 0.3.0/server/binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/solace/{server/solaceServerBinding - wrongly extended.json => 0.3.0/server/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/solace/{server/solaceServerBinding.json => 0.3.0/server/binding.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 43219ec8..bd8057ec 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.bindings.pulsar.PulsarChannelBinding; import com.asyncapi.bindings.redis.RedisChannelBinding; import com.asyncapi.bindings.sns.SNSChannelBinding; -import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.SolaceChannelBinding; import com.asyncapi.bindings.sqs.SQSChannelBinding; import com.asyncapi.bindings.stomp.STOMPChannelBinding; import com.asyncapi.bindings.websockets.WebSocketsChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 7e1b1f8b..138328df 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.bindings.pulsar.PulsarMessageBinding; import com.asyncapi.bindings.redis.RedisMessageBinding; import com.asyncapi.bindings.sns.SNSMessageBinding; -import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.SolaceMessageBinding; import com.asyncapi.bindings.sqs.SQSMessageBinding; import com.asyncapi.bindings.stomp.STOMPMessageBinding; import com.asyncapi.bindings.websockets.WebSocketsMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index d5536db1..2aa5cbd7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.bindings.pulsar.PulsarOperationBinding; import com.asyncapi.bindings.redis.RedisOperationBinding; import com.asyncapi.bindings.sns.SNSOperationBinding; -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.SolaceOperationBinding; import com.asyncapi.bindings.sqs.SQSOperationBinding; import com.asyncapi.bindings.stomp.STOMPOperationBinding; import com.asyncapi.bindings.websockets.WebSocketsOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 691821a6..06b734cb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -15,7 +15,7 @@ import com.asyncapi.bindings.pulsar.PulsarServerBinding; import com.asyncapi.bindings.redis.RedisServerBinding; import com.asyncapi.bindings.sns.SNSServerBinding; -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; +import com.asyncapi.bindings.solace.SolaceServerBinding; import com.asyncapi.bindings.sqs.SQSServerBinding; import com.asyncapi.bindings.stomp.STOMPServerBinding; import com.asyncapi.bindings.websockets.WebSocketsServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java new file mode 100644 index 00000000..74efa092 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Solace channel binding. + * + * @version 0.3.0 + * @see Solace channel binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class SolaceChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java new file mode 100644 index 00000000..ea62c6db --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Solace message binding. + * + * @version 0.3.0 + * @see Solace message binding + * @author Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class SolaceMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java new file mode 100644 index 00000000..a14c1f3e --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * Describes Solace operation binding. + *

+ * Contains information about the operation representation in Solace PubSub+ Broker. + * + * @version 0.3.0 + * @see Solace operation binding + * @author Dennis Brinley, Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class SolaceOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java new file mode 100644 index 00000000..47f31187 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java @@ -0,0 +1,31 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * Describes Solace server binding. + * + * @version 0.3.0 + * @see Solace server binding + * @author Dennis Brinley, Pavel Bodiachevskii + */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding.class, names = { + "0.3.0", + "latest" + }), +}) +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class SolaceServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java index 4d321493..5ba426aa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.solace.v0._3_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -19,5 +19,16 @@ @Builder @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SolaceChannelBinding extends ChannelBinding { +public class SolaceChannelBinding extends com.asyncapi.bindings.solace.SolaceChannelBinding { + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java index 136e96de..eb3ed54d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.solace.v0._3_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -19,5 +19,16 @@ @Builder @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SolaceMessageBinding extends MessageBinding { +public class SolaceMessageBinding extends com.asyncapi.bindings.solace.SolaceMessageBinding { + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java index cb2bb717..17483c2e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.solace.v0._3_0.operation; -import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -24,7 +23,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Solace operation binding.") -public class SolaceOperationBinding extends OperationBinding { +public class SolaceOperationBinding extends com.asyncapi.bindings.solace.SolaceOperationBinding { /** * List of destinations @@ -34,13 +33,14 @@ public class SolaceOperationBinding extends OperationBinding { @JsonPropertyDescription("List of destinations") private List destinations; - /** - * The version of this binding. (e.g. bindingVersion: 0.3.0) - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.3.0"; + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java index 84c73ad2..edd289da 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.solace.v0._3_0.server; -import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -20,7 +19,7 @@ @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @JsonClassDescription("Describes Solace server binding.") -public class SolaceServerBinding extends ServerBinding { +public class SolaceServerBinding extends com.asyncapi.bindings.solace.SolaceServerBinding { /** * Message VPN of the Solace Broker @@ -32,13 +31,14 @@ public class SolaceServerBinding extends ServerBinding { @JsonPropertyDescription("Message VPN of the Solace Broker") private String msgVpn; - /** - * The version of this binding. - */ - @Nullable - @Builder.Default - @JsonProperty("bindingVersion") - @JsonPropertyDescription("The version of this binding.") - private String bindingVersion = "0.3.0"; + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/Solace.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/Solace.java new file mode 100644 index 00000000..b8eb11e9 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/Solace.java @@ -0,0 +1,11 @@ +package com.asyncapi.bindings.solace; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("Solace") +@SelectPackages("com.asyncapi.bindings.solace") +public class Solace { +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceLatestTest.java new file mode 100644 index 00000000..aece2c82 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class SolaceLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = SolaceV0_3_0Test.channelBinding(); + super.bindingTypeClass = SolaceChannelBinding.class; + super.pathToBindingJson = "/bindings/solace/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = SolaceV0_3_0Test.messageBinding(); + super.bindingTypeClass = SolaceMessageBinding.class; + super.pathToBindingJson = "/bindings/solace/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = SolaceV0_3_0Test.operationBinding(); + super.bindingTypeClass = SolaceOperationBinding.class; + super.pathToBindingJson = "/bindings/solace/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = SolaceV0_3_0Test.serverBinding(); + super.bindingTypeClass = SolaceServerBinding.class; + super.pathToBindingJson = "/bindings/solace/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceUnknownVersionTest.java new file mode 100644 index 00000000..5e6fc20f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class SolaceUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = SolaceV0_3_0Test.channelBinding(); + super.bindingTypeClass = SolaceChannelBinding.class; + super.pathToBindingJson = "/bindings/solace/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = SolaceV0_3_0Test.messageBinding(); + super.bindingTypeClass = SolaceMessageBinding.class; + super.pathToBindingJson = "/bindings/solace/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = SolaceV0_3_0Test.operationBinding(); + super.bindingTypeClass = SolaceOperationBinding.class; + super.pathToBindingJson = "/bindings/solace/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = SolaceV0_3_0Test.serverBinding(); + super.bindingTypeClass = SolaceServerBinding.class; + super.pathToBindingJson = "/bindings/solace/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_3_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_3_0Test.java new file mode 100644 index 00000000..7c6f695f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_3_0Test.java @@ -0,0 +1,103 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationDestination; +import com.asyncapi.bindings.solace.v0._3_0.operation.queue.SolaceOperationQueue; +import com.asyncapi.bindings.solace.v0._3_0.operation.topic.SolaceOperationTopic; +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.3.0") +public class SolaceV0_3_0Test { + + public static SolaceChannelBinding channelBinding () { + return new SolaceChannelBinding(); + } + + public static SolaceMessageBinding messageBinding () { + return new SolaceMessageBinding(); + } + + public static SolaceOperationBinding operationBinding () { + return SolaceOperationBinding.builder() + .destinations(List.of( + SolaceOperationDestination.builder() + .destinationType(SolaceOperationDestination.Type.QUEUE) + .queue(SolaceOperationQueue.builder() + .name("CreatedHREvents") + .topicSubscriptions(List.of("person/*/created")) + .accessType(SolaceOperationQueue.AccessType.EXCLUSIVE) + .maxMsgSpoolSize("1,500") + .maxTtl("60") + .build() + ) + .build(), + SolaceOperationDestination.builder() + .destinationType(SolaceOperationDestination.Type.QUEUE) + .queue(SolaceOperationQueue.builder() + .name("UpdatedHREvents") + .topicSubscriptions(List.of("person/*/updated")) + .build() + ) + .topic(SolaceOperationTopic.builder() + .topicSubscriptions(List.of("person/*/updated")) + .build() + ) + .build() + )) + .build(); + } + + public static SolaceServerBinding serverBinding () { + return SolaceServerBinding.builder() + .msgVpn("solace.private.net") + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = SolaceChannelBinding.class; + super.pathToBindingJson = "/bindings/solace/0.3.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.3.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.3.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = SolaceMessageBinding.class; + super.pathToBindingJson = "/bindings/solace/0.3.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.3.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.3.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = SolaceOperationBinding.class; + super.pathToBindingJson = "/bindings/solace/0.3.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.3.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.3.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = SolaceServerBinding.class; + super.pathToBindingJson = "/bindings/solace/0.3.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.3.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.3.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceWithoutVersionTest.java new file mode 100644 index 00000000..ea793f3a --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class SolaceWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = SolaceV0_3_0Test.channelBinding(); + super.bindingTypeClass = SolaceChannelBinding.class; + super.pathToBindingJson = "/bindings/solace/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = SolaceV0_3_0Test.messageBinding(); + super.bindingTypeClass = SolaceMessageBinding.class; + super.pathToBindingJson = "/bindings/solace/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = SolaceV0_3_0Test.operationBinding(); + super.bindingTypeClass = SolaceOperationBinding.class; + super.pathToBindingJson = "/bindings/solace/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = SolaceV0_3_0Test.serverBinding(); + super.bindingTypeClass = SolaceServerBinding.class; + super.pathToBindingJson = "/bindings/solace/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt deleted file mode 100644 index b3dbb7ed..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBindingTest.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.asyncapi.bindings.solace.v0._3_0.operation - -import com.asyncapi.v3.SerDeTest -import com.asyncapi.bindings.solace.v0._3_0.operation.queue.SolaceOperationQueue -import com.asyncapi.bindings.solace.v0._3_0.operation.topic.SolaceOperationTopic - -class SolaceOperationBindingTest: SerDeTest() { - - override fun objectClass() = SolaceOperationBinding::class.java - - override fun baseObjectJson() = "/bindings/solace/operation/solaceOperationBinding.json" - - override fun extendedObjectJson() = "/bindings/solace/operation/solaceOperationBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/solace/operation/solaceOperationBinding - wrongly extended.json" - - override fun build(): SolaceOperationBinding { - return SolaceOperationBinding.builder() - .destinations(listOf( - SolaceOperationDestination.builder() - .destinationType(SolaceOperationDestination.Type.QUEUE) - .queue(SolaceOperationQueue.builder() - .name("CreatedHREvents") - .topicSubscriptions(listOf("person/*/created")) - .accessType(SolaceOperationQueue.AccessType.EXCLUSIVE) - .maxMsgSpoolSize("1,500") - .maxTtl("60") - .build() - ) - .build(), - SolaceOperationDestination.builder() - .destinationType(SolaceOperationDestination.Type.QUEUE) - .queue(SolaceOperationQueue.builder() - .name("UpdatedHREvents") - .topicSubscriptions(listOf("person/*/updated")) - .build() - ) - .topic(SolaceOperationTopic.builder() - .topicSubscriptions(listOf("person/*/updated")) - .build() - ) - .build() - )) - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt deleted file mode 100644 index 37e192c0..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBindingTest.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.asyncapi.bindings.solace.v0._3_0.server - -import com.asyncapi.v3.SerDeTest - -/** - * @version 3.0.0 - * @author Pavel Bodiachevskii - */ -class SolaceServerBindingTest: SerDeTest() { - - override fun objectClass() = SolaceServerBinding::class.java - - override fun baseObjectJson() = "/bindings/solace/server/solaceServerBinding.json" - - override fun extendedObjectJson() = "/bindings/solace/server/solaceServerBinding - extended.json" - - override fun wronglyExtendedObjectJson() = "/bindings/solace/server/solaceServerBinding - wrongly extended.json" - - override fun build(): SolaceServerBinding { - return SolaceServerBinding.builder() - .msgVpn("solace.private.net") - .build() - } - -} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 53fc15f6..8e748365 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.SolaceV0_3_0Test import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding @@ -116,7 +116,7 @@ class OperationTest { Pair("pulsar", PulsarOperationBinding()), Pair("redis", RedisOperationBinding()), Pair("sns", SNSOperationBinding()), - Pair("solace", SolaceOperationBindingTest().build()), + Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", SQSOperationBinding()), Pair("stomp", STOMPOperationBinding()), Pair("ws", WebSocketsOperationBinding()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index eb7d92b3..4fc27036 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.SolaceV0_3_0Test import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding @@ -65,7 +65,7 @@ class OperationTraitTest: SerDeTest() { Pair("pulsar", PulsarOperationBinding()), Pair("redis", RedisOperationBinding()), Pair("sns", SNSOperationBinding()), - Pair("solace", SolaceOperationBindingTest().build()), + Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", SQSOperationBinding()), Pair("stomp", STOMPOperationBinding()), Pair("ws", WebSocketsOperationBinding()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 2a23aab7..4b033ed2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.SolaceV0_3_0Test class OperationWithReferenceToMessageTest: SerDeTest() { @@ -151,7 +151,7 @@ class OperationTest { Pair("pulsar", Reference("#/components/operationBindings/pulsar")), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), - Pair("solace", SolaceOperationBindingTest().build()), + Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs")), Pair("stomp", Reference("#/components/operationBindings/stomp")), Pair("ws", Reference("#/components/operationBindings/ws")) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 0cb65960..6c66ba72 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.SolaceV0_3_0Test class OperationTraitTest: SerDeTest() { @@ -55,7 +55,7 @@ class OperationTraitTest: SerDeTest() { Pair("pulsar", Reference("#/components/operationBindings/pulsar")), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), - Pair("solace", SolaceOperationBindingTest().build()), + Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs")), Pair("stomp", Reference("#/components/operationBindings/stomp")), Pair("ws", Reference("#/components/operationBindings/ws")) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 4202f800..fe710870 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.SolaceV0_3_0Test import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation @@ -82,7 +82,7 @@ class OperationTest: SerDeTest() { Pair("pulsar", Reference("#/components/operationBindings/pulsar")), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), - Pair("solace", SolaceOperationBindingTest().build()), + Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs")), Pair("stomp", Reference("#/components/operationBindings/stomp")), Pair("ws", Reference("#/components/operationBindings/ws")) @@ -144,7 +144,7 @@ class OperationTestWithReference: SerDeTest() { ), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), - Pair("solace", SolaceOperationBindingTest().build()), + Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs")), Pair("stomp", Reference("#/components/operationBindings/stomp")), Pair("ws", Reference("#/components/operationBindings/ws")) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index a9960a99..27e7e5a9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBindingTest +import com.asyncapi.bindings.solace.SolaceV0_3_0Test import com.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation @@ -66,7 +66,7 @@ class OperationTraitTest: SerDeTest() { ), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), - Pair("solace", SolaceOperationBindingTest().build()), + Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs")), Pair("stomp", Reference("#/components/operationBindings/stomp")), Pair("ws", Reference("#/components/operationBindings/ws")) @@ -126,7 +126,7 @@ class OperationTraitTestWithReference: SerDeTest() { ), Pair("redis", Reference("#/components/operationBindings/redis")), Pair("sns", Reference("#/components/operationBindings/sns")), - Pair("solace", SolaceOperationBindingTest().build()), + Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs")), Pair("stomp", Reference("#/components/operationBindings/stomp")), Pair("ws", Reference("#/components/operationBindings/ws")) diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..943a1361 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding.json new file mode 100644 index 00000000..4c2843f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..943a1361 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding.json new file mode 100644 index 00000000..4c2843f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/solace/operation/solaceOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/solace/0.3.0/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/solace/0.3.0/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/solace/server/solaceServerBinding.json rename to asyncapi-core/src/test/resources/bindings/solace/0.3.0/server/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..fe7f9c54 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding.json new file mode 100644 index 00000000..c09b90a7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion" : "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..fe7f9c54 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding.json new file mode 100644 index 00000000..c09b90a7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion" : "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - extended.json new file mode 100644 index 00000000..4b0c664e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - extended.json @@ -0,0 +1,29 @@ +{ + "bindingVersion" : "0.3.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "CreatedHREvents", + "topicSubscriptions" : [ "person/*/created" ], + "accessType" : "exclusive", + "maxMsgSpoolSize" : "1,500", + "maxTtl" : "60" + } + }, { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "UpdatedHREvents", + "topicSubscriptions" : [ "person/*/updated" ] + }, + "topic" : { + "topicSubscriptions" : [ "person/*/updated" ] + } + } ], + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..e431c6be --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - wrongly extended.json @@ -0,0 +1,37 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "CreatedHREvents", + "topicSubscriptions": [ + "person/*/created" + ], + "accessType": "exclusive", + "maxMsgSpoolSize": "1,500", + "maxTtl": "60" + } + }, + { + "destinationType": "queue", + "queue": { + "name": "UpdatedHREvents", + "topicSubscriptions": [ + "person/*/updated" + ] + }, + "topic": { + "topicSubscriptions": [ + "person/*/updated" + ] + } + } + ], + "bindingVersion" : "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding.json new file mode 100644 index 00000000..c142538f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding.json @@ -0,0 +1,31 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "CreatedHREvents", + "topicSubscriptions": [ + "person/*/created" + ], + "accessType": "exclusive", + "maxMsgSpoolSize": "1,500", + "maxTtl": "60" + } + }, + { + "destinationType": "queue", + "queue": { + "name": "UpdatedHREvents", + "topicSubscriptions": [ + "person/*/updated" + ] + }, + "topic": { + "topicSubscriptions": [ + "person/*/updated" + ] + } + } + ], + "bindingVersion" : "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - extended.json new file mode 100644 index 00000000..c545b3af --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..938397bb --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "msgVpn": "solace.private.net", + "bindingVersion" : "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding.json new file mode 100644 index 00000000..95e981d0 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding.json @@ -0,0 +1,4 @@ +{ + "msgVpn": "solace.private.net", + "bindingVersion" : "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..0b2786f2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding.json new file mode 100644 index 00000000..43fc5b66 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion" : "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..0b2786f2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding.json new file mode 100644 index 00000000..43fc5b66 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion" : "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..4b0c664e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - extended.json @@ -0,0 +1,29 @@ +{ + "bindingVersion" : "0.3.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "CreatedHREvents", + "topicSubscriptions" : [ "person/*/created" ], + "accessType" : "exclusive", + "maxMsgSpoolSize" : "1,500", + "maxTtl" : "60" + } + }, { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "UpdatedHREvents", + "topicSubscriptions" : [ "person/*/updated" ] + }, + "topic" : { + "topicSubscriptions" : [ "person/*/updated" ] + } + } ], + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..6a50037f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,37 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "CreatedHREvents", + "topicSubscriptions": [ + "person/*/created" + ], + "accessType": "exclusive", + "maxMsgSpoolSize": "1,500", + "maxTtl": "60" + } + }, + { + "destinationType": "queue", + "queue": { + "name": "UpdatedHREvents", + "topicSubscriptions": [ + "person/*/updated" + ] + }, + "topic": { + "topicSubscriptions": [ + "person/*/updated" + ] + } + } + ], + "bindingVersion" : "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding.json new file mode 100644 index 00000000..1cad5fe1 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding.json @@ -0,0 +1,31 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "CreatedHREvents", + "topicSubscriptions": [ + "person/*/created" + ], + "accessType": "exclusive", + "maxMsgSpoolSize": "1,500", + "maxTtl": "60" + } + }, + { + "destinationType": "queue", + "queue": { + "name": "UpdatedHREvents", + "topicSubscriptions": [ + "person/*/updated" + ] + }, + "topic": { + "topicSubscriptions": [ + "person/*/updated" + ] + } + } + ], + "bindingVersion" : "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - extended.json new file mode 100644 index 00000000..c545b3af --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..ecb3a7c9 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "msgVpn": "solace.private.net", + "bindingVersion" : "unknown version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding.json new file mode 100644 index 00000000..563d1846 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding.json @@ -0,0 +1,4 @@ +{ + "msgVpn": "solace.private.net", + "bindingVersion" : "unknown version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..51fc7912 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding.json new file mode 100644 index 00000000..f13343f5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion" : "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - extended.json new file mode 100644 index 00000000..8310c9d6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.3.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..51fc7912 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding.json new file mode 100644 index 00000000..f13343f5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion" : "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - extended.json new file mode 100644 index 00000000..4b0c664e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - extended.json @@ -0,0 +1,29 @@ +{ + "bindingVersion" : "0.3.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "CreatedHREvents", + "topicSubscriptions" : [ "person/*/created" ], + "accessType" : "exclusive", + "maxMsgSpoolSize" : "1,500", + "maxTtl" : "60" + } + }, { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "UpdatedHREvents", + "topicSubscriptions" : [ "person/*/updated" ] + }, + "topic" : { + "topicSubscriptions" : [ "person/*/updated" ] + } + } ], + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..24370dd6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - wrongly extended.json @@ -0,0 +1,37 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "CreatedHREvents", + "topicSubscriptions": [ + "person/*/created" + ], + "accessType": "exclusive", + "maxMsgSpoolSize": "1,500", + "maxTtl": "60" + } + }, + { + "destinationType": "queue", + "queue": { + "name": "UpdatedHREvents", + "topicSubscriptions": [ + "person/*/updated" + ] + }, + "topic": { + "topicSubscriptions": [ + "person/*/updated" + ] + } + } + ], + "bindingVersion" : "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding.json new file mode 100644 index 00000000..296c561c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding.json @@ -0,0 +1,31 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "CreatedHREvents", + "topicSubscriptions": [ + "person/*/created" + ], + "accessType": "exclusive", + "maxMsgSpoolSize": "1,500", + "maxTtl": "60" + } + }, + { + "destinationType": "queue", + "queue": { + "name": "UpdatedHREvents", + "topicSubscriptions": [ + "person/*/updated" + ] + }, + "topic": { + "topicSubscriptions": [ + "person/*/updated" + ] + } + } + ], + "bindingVersion" : "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - extended.json new file mode 100644 index 00000000..c545b3af --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.3.0", + "msgVpn" : "solace.private.net", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..26cc943d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "msgVpn": "solace.private.net", + "bindingVersion" : "without version", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding.json new file mode 100644 index 00000000..24e582ab --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding.json @@ -0,0 +1,4 @@ +{ + "msgVpn": "solace.private.net", + "bindingVersion" : "without version" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index e380652b..75debf33 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -775,7 +775,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, @@ -919,7 +921,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, @@ -1110,7 +1114,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, @@ -1504,7 +1510,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, @@ -1712,7 +1720,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, @@ -1938,7 +1948,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index f095b3b2..cdd33528 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -658,7 +658,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, @@ -802,7 +804,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index f8518db7..545a2261 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -126,7 +126,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 358b5b6d..ea46fcd2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -115,7 +115,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index dbb6f21b..9fc9bb70 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -389,7 +389,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 02d7a79a..27ac037e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -157,7 +157,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, @@ -551,7 +553,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, @@ -759,7 +763,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, @@ -985,7 +991,9 @@ "sns" : { "bindingVersion" : "0.1.0" }, - "solace" : { }, + "solace" : { + "bindingVersion" : "0.3.0" + }, "sqs" : { "bindingVersion" : "0.1.0" }, From 8e2c30ebb61e321f144035c71f4490d16b6d02d4 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 30 Apr 2024 16:42:02 +0400 Subject: [PATCH 058/141] feat(bindings): all parent classes must be abstract https://github.com/asyncapi/jasyncapi/issues/184 --- .../java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java | 2 +- .../java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java | 2 +- .../java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java | 2 +- .../java/com/asyncapi/bindings/kafka/KafkaServerBinding.java | 2 +- .../java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java | 2 +- .../java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java | 2 +- .../java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java | 2 +- .../main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java index d393393a..f9e819ce 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java @@ -26,4 +26,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class KafkaChannelBinding extends ChannelBinding {} \ No newline at end of file +public abstract class KafkaChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java index 7f231b72..4d296199 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class KafkaMessageBinding extends MessageBinding {} \ No newline at end of file +public abstract class KafkaMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java index c4a3b8bf..bc196616 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java @@ -28,4 +28,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class KafkaOperationBinding extends OperationBinding {} \ No newline at end of file +public abstract class KafkaOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java index ae03fc20..86cdd075 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java @@ -26,4 +26,4 @@ }), }) @EqualsAndHashCode(callSuper = true) -public class KafkaServerBinding extends ServerBinding {} \ No newline at end of file +public abstract class KafkaServerBinding extends ServerBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java index ed1b870d..a509c2cb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java @@ -11,4 +11,4 @@ * @see MQTT channel binding * @author Pavel Bodiachevskii */ -public class MQTTChannelBinding extends ChannelBinding {} \ No newline at end of file +public abstract class MQTTChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java index 40850a3f..ce8fe322 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java @@ -11,4 +11,4 @@ * @see MQTT message binding * @author Pavel Bodiachevskii */ -public class MQTTMessageBinding extends MessageBinding {} \ No newline at end of file +public abstract class MQTTMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java index 43b6eae6..efc12256 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java @@ -11,4 +11,4 @@ * @see MQTT operation binding * @author Pavel Bodiachevskii */ -public class MQTTOperationBinding extends OperationBinding {} \ No newline at end of file +public abstract class MQTTOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java index ed7752f8..1156b2ac 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java @@ -11,4 +11,4 @@ * @see MQTT server binding * @author Pavel Bodiachevskii */ -public class MQTTServerBinding extends ServerBinding {} \ No newline at end of file +public abstract class MQTTServerBinding extends ServerBinding {} \ No newline at end of file From f5028f5846e35b111c23707453559d5f2216b1a3 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 30 Apr 2024 16:44:53 +0400 Subject: [PATCH 059/141] feat(bindings): use parents in serde https://github.com/asyncapi/jasyncapi/issues/184 --- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../bindings/OperationBindingsDeserializer.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../bindings/mqtt/MQTTChannelBinding.java | 17 +++++++++++++++++ .../bindings/mqtt/MQTTMessageBinding.java | 17 +++++++++++++++++ .../bindings/mqtt/MQTTOperationBinding.java | 17 +++++++++++++++++ .../bindings/mqtt/MQTTServerBinding.java | 17 +++++++++++++++++ 8 files changed, 72 insertions(+), 4 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index bd8057ec..05f35de4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -9,7 +9,7 @@ import com.asyncapi.bindings.jms.JMSChannelBinding; import com.asyncapi.bindings.kafka.KafkaChannelBinding; import com.asyncapi.bindings.mercure.MercureChannelBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.MQTTChannelBinding; import com.asyncapi.bindings.mqtt5.MQTT5ChannelBinding; import com.asyncapi.bindings.nats.NATSChannelBinding; import com.asyncapi.bindings.pulsar.PulsarChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 138328df..3c03744b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -9,7 +9,7 @@ import com.asyncapi.bindings.jms.JMSMessageBinding; import com.asyncapi.bindings.kafka.KafkaMessageBinding; import com.asyncapi.bindings.mercure.MercureMessageBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.MQTTMessageBinding; import com.asyncapi.bindings.mqtt5.MQTT5MessageBinding; import com.asyncapi.bindings.nats.NATSMessageBinding; import com.asyncapi.bindings.pulsar.PulsarMessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 2aa5cbd7..995e3272 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -9,7 +9,7 @@ import com.asyncapi.bindings.jms.JMSOperationBinding; import com.asyncapi.bindings.kafka.KafkaOperationBinding; import com.asyncapi.bindings.mercure.MercureOperationBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.MQTTOperationBinding; import com.asyncapi.bindings.mqtt5.MQTT5OperationBinding; import com.asyncapi.bindings.nats.NATSOperationBinding; import com.asyncapi.bindings.pulsar.PulsarOperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 06b734cb..8ee2a09a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -9,7 +9,7 @@ import com.asyncapi.bindings.jms.JMSServerBinding; import com.asyncapi.bindings.kafka.KafkaServerBinding; import com.asyncapi.bindings.mercure.MercureServerBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; +import com.asyncapi.bindings.mqtt.MQTTServerBinding; import com.asyncapi.bindings.mqtt5.MQTT5ServerBinding; import com.asyncapi.bindings.nats.NATSServerBinding; import com.asyncapi.bindings.pulsar.PulsarServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java index a509c2cb..ccc41d93 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java @@ -1,6 +1,9 @@ package com.asyncapi.bindings.mqtt; import com.asyncapi.bindings.ChannelBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; /** * This class MUST NOT contain any properties. Its name is reserved for future use. @@ -11,4 +14,18 @@ * @see MQTT channel binding * @author Pavel Bodiachevskii */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) public abstract class MQTTChannelBinding extends ChannelBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java index ce8fe322..e1d8cdfa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java @@ -1,6 +1,9 @@ package com.asyncapi.bindings.mqtt; import com.asyncapi.bindings.MessageBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; /** * Describes MQTT message binding. @@ -11,4 +14,18 @@ * @see MQTT message binding * @author Pavel Bodiachevskii */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) public abstract class MQTTMessageBinding extends MessageBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java index efc12256..580cf77a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java @@ -1,6 +1,9 @@ package com.asyncapi.bindings.mqtt; import com.asyncapi.bindings.OperationBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; /** * Describes MQTT operation binding. @@ -11,4 +14,18 @@ * @see MQTT operation binding * @author Pavel Bodiachevskii */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) public abstract class MQTTOperationBinding extends OperationBinding {} \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java index 1156b2ac..2002ecdd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java @@ -1,6 +1,9 @@ package com.asyncapi.bindings.mqtt; import com.asyncapi.bindings.ServerBinding; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; /** * Describes MQTT server binding. @@ -11,4 +14,18 @@ * @see MQTT server binding * @author Pavel Bodiachevskii */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.EXISTING_PROPERTY, + defaultImpl = com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding.class, + property = "bindingVersion", + visible = true +) +@JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding.class, names = { + "0.1.0", + "latest" + }), +}) +@EqualsAndHashCode(callSuper = true) public abstract class MQTTServerBinding extends ServerBinding {} \ No newline at end of file From 5d6263a9dfeb9147f8e4c945663b7bd9be9fc925 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 30 Apr 2024 16:52:31 +0400 Subject: [PATCH 060/141] feat(bindings): Bindings test suite https://github.com/asyncapi/jasyncapi/issues/184 --- .../com/asyncapi/bindings/BindingsTest.java | 53 ++++++++++--------- .../com/asyncapi/bindings/mqtt/MQTT.java | 2 +- .../com/asyncapi/bindings/nats/NATS.java | 2 +- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java index be3ba6d5..e8e60843 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java @@ -1,29 +1,30 @@ package com.asyncapi.bindings; -import com.asyncapi.bindings.amqp1.AMQP1Test; -import com.asyncapi.bindings.redis.RedisTest; -import com.asyncapi.bindings.stomp.STOMPTest; -import com.asyncapi.bindings.websockets.WebSocketsTest; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; -@DisplayName("Bindings") -public class BindingsTest { - - @Nested - @DisplayName("AMQP1") - class AMQP1 extends AMQP1Test {} - - @Nested - @DisplayName("Redis") - class Redis extends RedisTest {} - - @Nested - @DisplayName("STOMP") - class STOMP extends STOMPTest {} - - @Nested - @DisplayName("WebSockets") - class WebSockets extends WebSocketsTest {} - -} +@Suite +@SelectClasses({ + com.asyncapi.bindings.amqp.AMQP.class, +// com.asyncapi.bindings.amqp1.AMQP.class, + com.asyncapi.bindings.anypointmq.AnypointMQ.class, + com.asyncapi.bindings.googlepubsub.GooglePubSub.class, + com.asyncapi.bindings.http.HTTP.class, + com.asyncapi.bindings.ibmmq.IBMMQ.class, + com.asyncapi.bindings.jms.JMS.class, + com.asyncapi.bindings.kafka.Kafka.class, + com.asyncapi.bindings.mercure.Mercure.class, + com.asyncapi.bindings.mqtt.MQTT.class, + com.asyncapi.bindings.mqtt5.MQTT5.class, + com.asyncapi.bindings.nats.NATS.class, + com.asyncapi.bindings.pulsar.Pulsar.class, +// com.asyncapi.bindings.redis.Pulsar.class, + com.asyncapi.bindings.sns.SNS.class, + com.asyncapi.bindings.solace.Solace.class, + com.asyncapi.bindings.sqs.SQS.class, +// com.asyncapi.bindings.stomp.STOMP.class, +// com.asyncapi.bindings.websockets.WebSockets.class, +}) +@SuiteDisplayName("Bindings") +public class BindingsTest {} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java index b271656f..21785200 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTT.java @@ -5,7 +5,7 @@ import org.junit.platform.suite.api.SuiteDisplayName; @Suite -@SuiteDisplayName("MQTT5") +@SuiteDisplayName("MQTT") @SelectPackages("com.asyncapi.bindings.mqtt") public class MQTT { } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATS.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATS.java index feb12c40..f7ce0eb3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATS.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/nats/NATS.java @@ -5,7 +5,7 @@ import org.junit.platform.suite.api.SuiteDisplayName; @Suite -@SuiteDisplayName("nats") +@SuiteDisplayName("NATS") @SelectPackages("com.asyncapi.bindings.nats") public class NATS { } From d0733fa82e444e263fd67595df70317423a67619 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 1 May 2024 20:58:48 +0400 Subject: [PATCH 061/141] test(bindings): AMQP1 test suite https://github.com/asyncapi/jasyncapi/issues/184 --- .../com/asyncapi/bindings/BindingsTest.java | 2 +- .../com/asyncapi/bindings/amqp1/AMQP1.java | 12 ++ .../bindings/amqp1/AMQP1LatestTest.java | 54 +++++ .../asyncapi/bindings/amqp1/AMQP1Test.java | 197 ------------------ .../amqp1/AMQP1UnknownVersionTest.java | 54 +++++ .../bindings/amqp1/AMQP1V0_1_0Test.java | 54 +++++ .../amqp1/AMQP1WithoutVersionTest.java | 54 +++++ 7 files changed, 229 insertions(+), 198 deletions(-) create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1LatestTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1UnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1V0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1WithoutVersionTest.java diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java index e8e60843..282b5ee3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java @@ -7,7 +7,7 @@ @Suite @SelectClasses({ com.asyncapi.bindings.amqp.AMQP.class, -// com.asyncapi.bindings.amqp1.AMQP.class, + com.asyncapi.bindings.amqp1.AMQP1.class, com.asyncapi.bindings.anypointmq.AnypointMQ.class, com.asyncapi.bindings.googlepubsub.GooglePubSub.class, com.asyncapi.bindings.http.HTTP.class, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1.java new file mode 100644 index 00000000..a22da9fa --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1.java @@ -0,0 +1,12 @@ +package com.asyncapi.bindings.amqp1; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("AMQP1") +@SelectPackages("com.asyncapi.bindings.amqp1") +public abstract class AMQP1 { + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1LatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1LatestTest.java new file mode 100644 index 00000000..0cb6afa3 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1LatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.amqp1; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class AMQP1LatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new AMQP1ChannelBinding(); + super.bindingTypeClass = AMQP1ChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new AMQP1MessageBinding(); + super.bindingTypeClass = AMQP1MessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new AMQP1OperationBinding(); + super.bindingTypeClass = AMQP1OperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new AMQP1ServerBinding(); + super.bindingTypeClass = AMQP1ServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1Test.java deleted file mode 100644 index a135eb8f..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1Test.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.asyncapi.bindings.amqp1; - -import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; -import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; - -public abstract class AMQP1Test { - - @Nested - @DisplayName("unknown version") - class UnknownVersionTest { - - @Nested - @DisplayName("channel") - class ChannelTest extends BindingTest {{ - super.binding = new AMQP1ChannelBinding(); - super.bindingTypeClass = AMQP1ChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("message") - class Message extends BindingTest {{ - super.binding = new AMQP1MessageBinding(); - super.bindingTypeClass = AMQP1MessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("operation") - class Operation extends BindingTest {{ - super.binding = new AMQP1OperationBinding(); - super.bindingTypeClass = AMQP1OperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("server") - class Server extends BindingTest {{ - super.binding = new AMQP1ServerBinding(); - super.bindingTypeClass = AMQP1ServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; - }} - - } - - @Nested - @DisplayName("without version") - class WithoutVersion { - - @Nested - @DisplayName("channel") - class ChannelTest extends BindingTest {{ - super.binding = new AMQP1ChannelBinding(); - super.bindingTypeClass = AMQP1ChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("message") - class Message extends BindingTest {{ - super.binding = new AMQP1MessageBinding(); - super.bindingTypeClass = AMQP1MessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("operation") - class Operation extends BindingTest {{ - super.binding = new AMQP1OperationBinding(); - super.bindingTypeClass = AMQP1OperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("server") - class Server extends BindingTest {{ - super.binding = new AMQP1ServerBinding(); - super.bindingTypeClass = AMQP1ServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; - }} - - } - - @Nested - @DisplayName("latest") - class Latest { - - @Nested - @DisplayName("channel") - class ChannelTest extends BindingTest {{ - super.binding = new AMQP1ChannelBinding(); - super.bindingTypeClass = AMQP1ChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("message") - class Message extends BindingTest {{ - super.binding = new AMQP1MessageBinding(); - super.bindingTypeClass = AMQP1MessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("operation") - class Operation extends BindingTest {{ - super.binding = new AMQP1OperationBinding(); - super.bindingTypeClass = AMQP1OperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("server") - class Server extends BindingTest {{ - super.binding = new AMQP1ServerBinding(); - super.bindingTypeClass = AMQP1ServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; - }} - - } - - @Nested - @DisplayName("0.1.0") - class V0_1_0 { - - @Nested - @DisplayName("channel") - class ChannelTest extends BindingTest {{ - super.binding = new AMQP1ChannelBinding(); - super.bindingTypeClass = AMQP1ChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("message") - class Message extends BindingTest {{ - super.binding = new AMQP1MessageBinding(); - super.bindingTypeClass = AMQP1MessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("operation") - class Operation extends BindingTest {{ - super.binding = new AMQP1OperationBinding(); - super.bindingTypeClass = AMQP1OperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; - }} - - @Nested - @DisplayName("server") - class Server extends BindingTest {{ - super.binding = new AMQP1ServerBinding(); - super.bindingTypeClass = AMQP1ServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; - }} - - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1UnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1UnknownVersionTest.java new file mode 100644 index 00000000..42dd419e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1UnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.amqp1; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class AMQP1UnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new AMQP1ChannelBinding(); + super.bindingTypeClass = AMQP1ChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new AMQP1MessageBinding(); + super.bindingTypeClass = AMQP1MessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new AMQP1OperationBinding(); + super.bindingTypeClass = AMQP1OperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new AMQP1ServerBinding(); + super.bindingTypeClass = AMQP1ServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1V0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1V0_1_0Test.java new file mode 100644 index 00000000..2c9df4fe --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1V0_1_0Test.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.amqp1; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class AMQP1V0_1_0Test { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new AMQP1ChannelBinding(); + super.bindingTypeClass = AMQP1ChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new AMQP1MessageBinding(); + super.bindingTypeClass = AMQP1MessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new AMQP1OperationBinding(); + super.bindingTypeClass = AMQP1OperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new AMQP1ServerBinding(); + super.bindingTypeClass = AMQP1ServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1WithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1WithoutVersionTest.java new file mode 100644 index 00000000..a83b8562 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/amqp1/AMQP1WithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.amqp1; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding; +import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class AMQP1WithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new AMQP1ChannelBinding(); + super.bindingTypeClass = AMQP1ChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new AMQP1MessageBinding(); + super.bindingTypeClass = AMQP1MessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new AMQP1OperationBinding(); + super.bindingTypeClass = AMQP1OperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new AMQP1ServerBinding(); + super.bindingTypeClass = AMQP1ServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} From 15545217f7ed499f6ed4d10c317f3d6211e83089 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 1 May 2024 21:23:55 +0400 Subject: [PATCH 062/141] test(bindings): Redis test suite https://github.com/asyncapi/jasyncapi/issues/184 --- .../com/asyncapi/bindings/BindingsTest.java | 2 +- .../com/asyncapi/bindings/redis/Redis.java | 10 ++ .../bindings/redis/RedisLatestTest.java | 54 +++++++++++ .../asyncapi/bindings/redis/RedisTest.java | 96 ------------------- .../redis/RedisUnknownVersionTest.java | 54 +++++++++++ .../bindings/redis/RedisV0_1_0Test.java | 54 +++++++++++ .../redis/RedisWithoutVersionTest.java | 54 +++++++++++ .../channel/RedisChannelBindingTest.java | 42 -------- .../message/RedisMessageBindingTest.java | 40 -------- .../operation/RedisOperationBindingTest.java | 40 -------- .../latest/server/RedisServerBindingTest.java | 40 -------- .../channel/RedisChannelBindingTest.java | 42 -------- .../message/RedisMessageBindingTest.java | 40 -------- .../operation/RedisOperationBindingTest.java | 40 -------- .../server/RedisServerBindingTest.java | 40 -------- .../redis/v0/_1_0/RedisBindingProvider.java | 27 ------ .../_1_0/channel/RedisChannelBindingTest.java | 41 -------- .../_1_0/message/RedisMessageBindingTest.java | 39 -------- .../operation/RedisOperationBindingTest.java | 39 -------- .../_1_0/server/RedisServerBindingTest.java | 39 -------- .../channel/RedisChannelBindingTest.java | 42 -------- .../message/RedisMessageBindingTest.java | 40 -------- .../operation/RedisOperationBindingTest.java | 40 -------- .../server/RedisServerBindingTest.java | 40 -------- 24 files changed, 227 insertions(+), 768 deletions(-) create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/Redis.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisLatestTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/channel/RedisChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/message/RedisMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/operation/RedisOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/server/RedisServerBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/channel/RedisChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/message/RedisMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/operation/RedisOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/server/RedisServerBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/RedisBindingProvider.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/channel/RedisChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/message/RedisMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/operation/RedisOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/server/RedisServerBindingTest.java diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java index 282b5ee3..58a0937e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java @@ -19,7 +19,7 @@ com.asyncapi.bindings.mqtt5.MQTT5.class, com.asyncapi.bindings.nats.NATS.class, com.asyncapi.bindings.pulsar.Pulsar.class, -// com.asyncapi.bindings.redis.Pulsar.class, + com.asyncapi.bindings.redis.Redis.class, com.asyncapi.bindings.sns.SNS.class, com.asyncapi.bindings.solace.Solace.class, com.asyncapi.bindings.sqs.SQS.class, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/Redis.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/Redis.java new file mode 100644 index 00000000..404010d0 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/Redis.java @@ -0,0 +1,10 @@ +package com.asyncapi.bindings.redis; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("Redis") +@SelectPackages("com.asyncapi.bindings.redis") +public class Redis {} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisLatestTest.java new file mode 100644 index 00000000..bc833cac --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.redis; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class RedisLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new RedisChannelBinding(); + super.bindingTypeClass = RedisChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new RedisMessageBinding(); + super.bindingTypeClass = RedisMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new RedisOperationBinding(); + super.bindingTypeClass = RedisOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new RedisServerBinding(); + super.bindingTypeClass = RedisServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisTest.java deleted file mode 100644 index ff378658..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisTest.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.asyncapi.bindings.redis; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; - -public abstract class RedisTest { - - @Nested - @DisplayName("unknown version") - class UnknownVersion { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.redis.unknownversion.channel.RedisChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.redis.unknownversion.message.RedisMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.redis.unknownversion.operation.RedisOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.redis.unknownversion.server.RedisServerBindingTest {} - - } - - @Nested - @DisplayName("without version") - class WithoutVersion { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.redis.withoutversion.channel.RedisChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.redis.withoutversion.message.RedisMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.redis.withoutversion.operation.RedisOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.redis.withoutversion.server.RedisServerBindingTest {} - - } - - @Nested - @DisplayName("latest") - class Latest { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.redis.latest.channel.RedisChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.redis.latest.message.RedisMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.redis.latest.operation.RedisOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.redis.latest.server.RedisServerBindingTest {} - - } - - @Nested - @DisplayName("0.1.0") - class V0_1_0 { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBindingTest {} - - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisUnknownVersionTest.java new file mode 100644 index 00000000..3a674da8 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.redis; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class RedisUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new RedisChannelBinding(); + super.bindingTypeClass = RedisChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new RedisMessageBinding(); + super.bindingTypeClass = RedisMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new RedisOperationBinding(); + super.bindingTypeClass = RedisOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new RedisServerBinding(); + super.bindingTypeClass = RedisServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisV0_1_0Test.java new file mode 100644 index 00000000..243e821b --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisV0_1_0Test.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.redis; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class RedisV0_1_0Test { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new RedisChannelBinding(); + super.bindingTypeClass = RedisChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new RedisMessageBinding(); + super.bindingTypeClass = RedisMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new RedisOperationBinding(); + super.bindingTypeClass = RedisOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new RedisServerBinding(); + super.bindingTypeClass = RedisServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisWithoutVersionTest.java new file mode 100644 index 00000000..205c399f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/RedisWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.redis; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; +import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; +import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; +import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class RedisWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new RedisChannelBinding(); + super.bindingTypeClass = RedisChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new RedisMessageBinding(); + super.bindingTypeClass = RedisMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new RedisOperationBinding(); + super.bindingTypeClass = RedisOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new RedisServerBinding(); + super.bindingTypeClass = RedisServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/channel/RedisChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/channel/RedisChannelBindingTest.java deleted file mode 100644 index f2fbabe2..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/channel/RedisChannelBindingTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.asyncapi.bindings.redis.latest.channel; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Nested; - -@Nested -public abstract class RedisChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/latest/channel/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/latest/channel/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/latest/channel/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisChannelBinding build() { - return RedisBindingProvider.channel(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/message/RedisMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/message/RedisMessageBindingTest.java deleted file mode 100644 index 832eb115..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/message/RedisMessageBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.redis.latest.message; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/latest/message/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/latest/message/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/latest/message/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisMessageBinding build() { - return RedisBindingProvider.message(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/operation/RedisOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/operation/RedisOperationBindingTest.java deleted file mode 100644 index 3467e0c1..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/operation/RedisOperationBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.redis.latest.operation; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/latest/operation/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/latest/operation/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/latest/operation/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisOperationBinding build() { - return RedisBindingProvider.operation(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/server/RedisServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/server/RedisServerBindingTest.java deleted file mode 100644 index 849441d1..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/latest/server/RedisServerBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.redis.latest.server; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/latest/server/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/latest/server/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/latest/server/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisServerBinding build() { - return RedisBindingProvider.server(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/channel/RedisChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/channel/RedisChannelBindingTest.java deleted file mode 100644 index f33a3d36..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/channel/RedisChannelBindingTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.asyncapi.bindings.redis.unknownversion.channel; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Nested; - -@Nested -public abstract class RedisChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/unknown version/channel/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/unknown version/channel/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisChannelBinding build() { - return RedisBindingProvider.channel(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/message/RedisMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/message/RedisMessageBindingTest.java deleted file mode 100644 index a75fd89d..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/message/RedisMessageBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.redis.unknownversion.message; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/unknown version/message/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/unknown version/message/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisMessageBinding build() { - return RedisBindingProvider.message(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/operation/RedisOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/operation/RedisOperationBindingTest.java deleted file mode 100644 index 86bcd1d8..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/operation/RedisOperationBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.redis.unknownversion.operation; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/unknown version/operation/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/unknown version/operation/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisOperationBinding build() { - return RedisBindingProvider.operation(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/server/RedisServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/server/RedisServerBindingTest.java deleted file mode 100644 index 2ac35f3d..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/unknownversion/server/RedisServerBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.redis.unknownversion.server; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/unknown version/server/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/unknown version/server/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisServerBinding build() { - return RedisBindingProvider.server(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/RedisBindingProvider.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/RedisBindingProvider.java deleted file mode 100644 index fc431efd..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/RedisBindingProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.asyncapi.bindings.redis.v0._1_0; - - -import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; -import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; -import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; -import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; - -public class RedisBindingProvider { - - public static RedisChannelBinding channel() { - return new RedisChannelBinding(); - } - - public static RedisMessageBinding message() { - return new RedisMessageBinding(); - } - - public static RedisOperationBinding operation() { - return new RedisOperationBinding(); - } - - public static RedisServerBinding server() { - return new RedisServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBindingTest.java deleted file mode 100644 index 92eddb66..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBindingTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.asyncapi.bindings.redis.v0._1_0.channel; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Nested; - -@Nested -public abstract class RedisChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/0.1.0/channel/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/0.1.0/channel/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisChannelBinding build() { - return RedisBindingProvider.channel(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBindingTest.java deleted file mode 100644 index ce756349..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.redis.v0._1_0.message; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/0.1.0/message/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/0.1.0/message/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisMessageBinding build() { - return RedisBindingProvider.message(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBindingTest.java deleted file mode 100644 index 5c94c0b1..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.redis.v0._1_0.operation; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/0.1.0/operation/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/0.1.0/operation/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisOperationBinding build() { - return RedisBindingProvider.operation(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBindingTest.java deleted file mode 100644 index 07df8c8c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.redis.v0._1_0.server; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/0.1.0/server/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/0.1.0/server/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisServerBinding build() { - return RedisBindingProvider.server(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/channel/RedisChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/channel/RedisChannelBindingTest.java deleted file mode 100644 index d10ff8c3..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/channel/RedisChannelBindingTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.asyncapi.bindings.redis.withoutversion.channel; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Nested; - -@Nested -public abstract class RedisChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/channel/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/channel/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/channel/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisChannelBinding build() { - return RedisBindingProvider.channel(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/message/RedisMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/message/RedisMessageBindingTest.java deleted file mode 100644 index c6a28ed2..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/message/RedisMessageBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.redis.withoutversion.message; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/message/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/message/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/message/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisMessageBinding build() { - return RedisBindingProvider.message(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/operation/RedisOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/operation/RedisOperationBindingTest.java deleted file mode 100644 index a59f2690..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/operation/RedisOperationBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.redis.withoutversion.operation; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/operation/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/operation/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisOperationBinding build() { - return RedisBindingProvider.operation(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/server/RedisServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/server/RedisServerBindingTest.java deleted file mode 100644 index aa66407b..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/redis/withoutversion/server/RedisServerBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.redis.withoutversion.server; - -import com.asyncapi.bindings.redis.v0._1_0.RedisBindingProvider; -import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class RedisServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return RedisServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/server/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/server/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/server/binding - wrongly extended.json"; - } - - @NotNull - @Override - public RedisServerBinding build() { - return RedisBindingProvider.server(); - } - -} From 2c7a46ea54df6cc453930a1303c89eb90074e7c4 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 1 May 2024 22:42:48 +0400 Subject: [PATCH 063/141] test(bindings): STOMP test suite https://github.com/asyncapi/jasyncapi/issues/184 --- .../com/asyncapi/bindings/BindingsTest.java | 2 +- .../com/asyncapi/bindings/stomp/STOMP.java | 10 ++ .../bindings/stomp/STOMPLatestTest.java | 54 +++++++++++ .../asyncapi/bindings/stomp/STOMPTest.java | 96 ------------------- .../stomp/STOMPUnknownVersionTest.java | 54 +++++++++++ .../bindings/stomp/STOMPV0_1_0Test.java | 54 +++++++++++ .../stomp/STOMPWithoutVersionTest.java | 54 +++++++++++ .../channel/STOMPChannelBindingTest.java | 42 -------- .../message/STOMPMessageBindingTest.java | 40 -------- .../operation/STOMPOperationBindingTest.java | 40 -------- .../latest/server/STOMPServerBindingTest.java | 39 -------- .../channel/STOMPChannelBindingTest.java | 42 -------- .../message/STOMPMessageBindingTest.java | 40 -------- .../operation/STOMPOperationBindingTest.java | 40 -------- .../server/STOMPServerBindingTest.java | 39 -------- .../stomp/v0/_1_0/STOMPBindingProvider.java | 26 ----- .../_1_0/channel/STOMPChannelBindingTest.java | 41 -------- .../_1_0/message/STOMPMessageBindingTest.java | 39 -------- .../operation/STOMPOperationBindingTest.java | 39 -------- .../_1_0/server/STOMPServerBindingTest.java | 39 -------- .../channel/STOMPChannelBindingTest.java | 42 -------- .../message/STOMPMessageBindingTest.java | 40 -------- .../operation/STOMPOperationBindingTest.java | 40 -------- .../server/STOMPServerBindingTest.java | 39 -------- 24 files changed, 227 insertions(+), 764 deletions(-) create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMP.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPLatestTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/STOMPBindingProvider.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java index 58a0937e..68ac84a6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java @@ -23,7 +23,7 @@ com.asyncapi.bindings.sns.SNS.class, com.asyncapi.bindings.solace.Solace.class, com.asyncapi.bindings.sqs.SQS.class, -// com.asyncapi.bindings.stomp.STOMP.class, + com.asyncapi.bindings.stomp.STOMP.class, // com.asyncapi.bindings.websockets.WebSockets.class, }) @SuiteDisplayName("Bindings") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMP.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMP.java new file mode 100644 index 00000000..5f6ce921 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMP.java @@ -0,0 +1,10 @@ +package com.asyncapi.bindings.stomp; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("STOMP") +@SelectPackages("com.asyncapi.bindings.stomp") +public class STOMP {} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPLatestTest.java new file mode 100644 index 00000000..4469a8a1 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.stomp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class STOMPLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new STOMPChannelBinding(); + super.bindingTypeClass = STOMPChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new STOMPMessageBinding(); + super.bindingTypeClass = STOMPMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new STOMPOperationBinding(); + super.bindingTypeClass = STOMPOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new STOMPServerBinding(); + super.bindingTypeClass = STOMPServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java deleted file mode 100644 index 0b10e67f..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPTest.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.asyncapi.bindings.stomp; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; - -public abstract class STOMPTest { - - @Nested - @DisplayName("unknown version") - class UnknownVersion { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.stomp.unknownversion.channel.STOMPChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.stomp.unknownversion.message.STOMPMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.stomp.unknownversion.operation.STOMPOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.stomp.unknownversion.server.STOMPServerBindingTest {} - - } - - @Nested - @DisplayName("without version") - class WithoutVersion { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.stomp.withoutversion.channel.STOMPChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.stomp.withoutversion.message.STOMPMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.stomp.withoutversion.operation.STOMPOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.stomp.withoutversion.server.STOMPServerBindingTest {} - - } - - @Nested - @DisplayName("latest") - class Latest { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.stomp.latest.channel.STOMPChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.stomp.latest.message.STOMPMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.stomp.latest.operation.STOMPOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.stomp.latest.server.STOMPServerBindingTest {} - - } - - @Nested - @DisplayName("0.1.0") - class V0_1_0 { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBindingTest {} - - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPUnknownVersionTest.java new file mode 100644 index 00000000..918a82db --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.stomp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class STOMPUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new STOMPChannelBinding(); + super.bindingTypeClass = STOMPChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new STOMPMessageBinding(); + super.bindingTypeClass = STOMPMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new STOMPOperationBinding(); + super.bindingTypeClass = STOMPOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new STOMPServerBinding(); + super.bindingTypeClass = STOMPServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPV0_1_0Test.java new file mode 100644 index 00000000..39f90808 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPV0_1_0Test.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.stomp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class STOMPV0_1_0Test { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new STOMPChannelBinding(); + super.bindingTypeClass = STOMPChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new STOMPMessageBinding(); + super.bindingTypeClass = STOMPMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new STOMPOperationBinding(); + super.bindingTypeClass = STOMPOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new STOMPServerBinding(); + super.bindingTypeClass = STOMPServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPWithoutVersionTest.java new file mode 100644 index 00000000..094c8afa --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/STOMPWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.stomp; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; +import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; +import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; +import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class STOMPWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = new STOMPChannelBinding(); + super.bindingTypeClass = STOMPChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = new STOMPMessageBinding(); + super.bindingTypeClass = STOMPMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = new STOMPOperationBinding(); + super.bindingTypeClass = STOMPOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = new STOMPServerBinding(); + super.bindingTypeClass = STOMPServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java deleted file mode 100644 index 07e4499a..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/channel/STOMPChannelBindingTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.asyncapi.bindings.stomp.latest.channel; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Nested; - -@Nested -public abstract class STOMPChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/latest/channel/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/latest/channel/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/latest/channel/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPChannelBinding build() { - return STOMPBindingProvider.channel(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java deleted file mode 100644 index 3a5fd07f..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/message/STOMPMessageBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.stomp.latest.message; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/latest/message/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/latest/message/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/latest/message/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPMessageBinding build() { - return STOMPBindingProvider.message(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java deleted file mode 100644 index 7b8784ba..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/operation/STOMPOperationBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.stomp.latest.operation; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/latest/operation/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/latest/operation/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/latest/operation/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPOperationBinding build() { - return STOMPBindingProvider.operation(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java deleted file mode 100644 index 014abbdf..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/latest/server/STOMPServerBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.stomp.latest.server; - -import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/latest/server/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/latest/server/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/latest/server/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPServerBinding build() { - return new STOMPServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java deleted file mode 100644 index 7fea27d2..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/channel/STOMPChannelBindingTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.asyncapi.bindings.stomp.unknownversion.channel; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Nested; - -@Nested -public abstract class STOMPChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/unknown version/channel/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/unknown version/channel/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPChannelBinding build() { - return STOMPBindingProvider.channel(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java deleted file mode 100644 index 28509d86..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/message/STOMPMessageBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.stomp.unknownversion.message; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/message/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/message/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/message/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPMessageBinding build() { - return STOMPBindingProvider.message(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java deleted file mode 100644 index e539368f..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/operation/STOMPOperationBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.stomp.unknownversion.operation; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/operation/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/operation/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPOperationBinding build() { - return STOMPBindingProvider.operation(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java deleted file mode 100644 index 3c436d51..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/unknownversion/server/STOMPServerBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.stomp.unknownversion.server; - -import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/server/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/server/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/server/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPServerBinding build() { - return new STOMPServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/STOMPBindingProvider.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/STOMPBindingProvider.java deleted file mode 100644 index c40ff9b8..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/STOMPBindingProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.asyncapi.bindings.stomp.v0._1_0; - -import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; -import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; -import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; -import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; - -public class STOMPBindingProvider { - - public static STOMPChannelBinding channel() { - return new STOMPChannelBinding(); - } - - public static STOMPMessageBinding message() { - return new STOMPMessageBinding(); - } - - public static STOMPOperationBinding operation() { - return new STOMPOperationBinding(); - } - - public static STOMPServerBinding server() { - return new STOMPServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBindingTest.java deleted file mode 100644 index 2bb1c1f6..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBindingTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.asyncapi.bindings.stomp.v0._1_0.channel; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Nested; - -@Nested -public abstract class STOMPChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/0.1.0/channel/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/0.1.0/channel/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPChannelBinding build() { - return STOMPBindingProvider.channel(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBindingTest.java deleted file mode 100644 index 485281c9..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.stomp.v0._1_0.message; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/0.1.0/message/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/0.1.0/message/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPMessageBinding build() { - return STOMPBindingProvider.message(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBindingTest.java deleted file mode 100644 index 5821f72d..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.stomp.v0._1_0.operation; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/0.1.0/operation/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/0.1.0/operation/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPOperationBinding build() { - return STOMPBindingProvider.operation(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBindingTest.java deleted file mode 100644 index d80ee8be..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.stomp.v0._1_0.server; - -import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/0.1.0/server/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/0.1.0/server/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPServerBinding build() { - return new STOMPServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java deleted file mode 100644 index 7211b83f..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/channel/STOMPChannelBindingTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.asyncapi.bindings.stomp.withoutversion.channel; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Nested; - -@Nested -public abstract class STOMPChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/channel/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/channel/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/channel/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPChannelBinding build() { - return STOMPBindingProvider.channel(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java deleted file mode 100644 index 8fd22677..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/message/STOMPMessageBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.stomp.withoutversion.message; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/message/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/message/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/message/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPMessageBinding build() { - return STOMPBindingProvider.message(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java deleted file mode 100644 index 43c91a68..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/operation/STOMPOperationBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.stomp.withoutversion.operation; - -import com.asyncapi.bindings.stomp.v0._1_0.STOMPBindingProvider; -import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/operation/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/operation/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPOperationBinding build() { - return STOMPBindingProvider.operation(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java deleted file mode 100644 index 4ea42c32..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/stomp/withoutversion/server/STOMPServerBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.stomp.withoutversion.server; - -import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class STOMPServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return STOMPServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/default implementation/without version/server/binding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/default implementation/without version/server/binding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/default implementation/without version/server/binding - wrongly extended.json"; - } - - @NotNull - @Override - public STOMPServerBinding build() { - return new STOMPServerBinding(); - } - -} From 7a48b7e4c5c0c00d185b71a59a3b102be75d9acc Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 1 May 2024 23:22:25 +0400 Subject: [PATCH 064/141] test(bindings): WebSockets test suite https://github.com/asyncapi/jasyncapi/issues/184 --- .../com/asyncapi/bindings/BindingsTest.java | 2 +- .../bindings/websockets/WebSockets.java | 10 ++ .../websockets/WebSocketsLatestTest.java | 54 +++++++++ .../bindings/websockets/WebSocketsTest.java | 96 ---------------- .../WebSocketsUnknownVersionTest.java | 54 +++++++++ .../websockets/WebSocketsV0_1_0Test.java | 106 ++++++++++++++++++ .../WebSocketsWithoutVersionTest.java | 54 +++++++++ .../channel/WebSocketsChannelBindingTest.java | 75 ------------- .../message/WebSocketsMessageBindingTest.java | 40 ------- .../WebSocketsOperationBindingTest.java | 40 ------- .../server/WebSocketsServerBindingTest.java | 40 ------- .../channel/WebSocketsChannelBindingTest.java | 75 ------------- .../message/WebSocketsMessageBindingTest.java | 40 ------- .../WebSocketsOperationBindingTest.java | 40 ------- .../server/WebSocketsServerBindingTest.java | 40 ------- .../v0/_1_0/WebSocketsBindingProvider.java | 62 ---------- .../channel/WebSocketsChannelBindingTest.java | 41 ------- .../message/WebSocketsMessageBindingTest.java | 39 ------- .../WebSocketsOperationBindingTest.java | 39 ------- .../server/WebSocketsServerBindingTest.java | 39 ------- .../channel/WebSocketsChannelBindingTest.java | 75 ------------- .../message/WebSocketsMessageBindingTest.java | 40 ------- .../WebSocketsOperationBindingTest.java | 40 ------- .../server/WebSocketsServerBindingTest.java | 40 ------- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../v3/_0_0/model/channel/ChannelTest.kt | 6 +- ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...ocketsChannelBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...ocketsMessageBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...ketsOperationBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...SocketsServerBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...ocketsChannelBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 .../binding - wrongly extended.json} | 0 .../binding.json} | 0 ... extended.json => binding - extended.json} | 0 .../operation/binding - wrongly extended.json | 9 ++ .../websockets/latest/operation/binding.json | 3 + ... extended.json => binding - extended.json} | 0 .../server/binding - wrongly extended.json | 9 ++ .../websockets/latest/server/binding.json | 3 + ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...ocketsChannelBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...ocketsMessageBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...ketsOperationBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...SocketsServerBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 ...d.json => binding - wrongly extended.json} | 0 ...ocketsChannelBinding.json => binding.json} | 0 ... extended.json => binding - extended.json} | 0 .../binding - wrongly extended.json} | 0 .../binding.json} | 0 ... extended.json => binding - extended.json} | 0 .../operation/binding - wrongly extended.json | 8 ++ .../without version/operation/binding.json | 1 + ... extended.json => binding - extended.json} | 0 .../server/binding - wrongly extended.json | 8 ++ .../without version/server/binding.json | 1 + 75 files changed, 328 insertions(+), 909 deletions(-) create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSockets.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsLatestTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsUnknownVersionTest.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsWithoutVersionTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/channel/WebSocketsChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/message/WebSocketsMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/operation/WebSocketsOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/server/WebSocketsServerBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/channel/WebSocketsChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/message/WebSocketsMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/operation/WebSocketsOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/server/WebSocketsServerBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/WebSocketsBindingProvider.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/channel/WebSocketsChannelBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/message/WebSocketsMessageBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/operation/WebSocketsOperationBindingTest.java delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/server/WebSocketsServerBindingTest.java rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/{webSocketsChannelBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/{webSocketsChannelBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/{webSocketsChannelBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/{webSocketsMessageBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/{webSocketsMessageBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/{webSocketsMessageBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/{webSocketsOperationBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/{webSocketsOperationBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/{webSocketsOperationBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/{webSocketsServerBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/{webSocketsServerBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/{webSocketsServerBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/latest/channel/{webSocketsChannelBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/latest/channel/{webSocketsChannelBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/latest/channel/{webSocketsChannelBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/latest/message/{webSocketsMessageBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/latest/{server/webSocketsServerBinding - wrongly extended.json => message/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/latest/{server/webSocketsServerBinding.json => message/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/latest/operation/{webSocketsOperationBinding - extended.json => binding - extended.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding.json rename asyncapi-core/src/test/resources/bindings/websockets/latest/server/{webSocketsServerBinding - extended.json => binding - extended.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding.json rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/{webSocketsChannelBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/{webSocketsChannelBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/{webSocketsChannelBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/{webSocketsMessageBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/{webSocketsMessageBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/{webSocketsMessageBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/{webSocketsOperationBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/{webSocketsOperationBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/{webSocketsOperationBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/{webSocketsServerBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/{webSocketsServerBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/{webSocketsServerBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/without version/channel/{webSocketsChannelBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/without version/channel/{webSocketsChannelBinding - wrongly extended.json => binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/without version/channel/{webSocketsChannelBinding.json => binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/without version/message/{webSocketsMessageBinding - extended.json => binding - extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/without version/{server/webSocketsServerBinding - wrongly extended.json => message/binding - wrongly extended.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/without version/{server/webSocketsServerBinding.json => message/binding.json} (100%) rename asyncapi-core/src/test/resources/bindings/websockets/without version/operation/{webSocketsOperationBinding - extended.json => binding - extended.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding.json rename asyncapi-core/src/test/resources/bindings/websockets/without version/server/{webSocketsServerBinding - extended.json => binding - extended.json} (100%) create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding.json diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java index 68ac84a6..20733e44 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingsTest.java @@ -24,7 +24,7 @@ com.asyncapi.bindings.solace.Solace.class, com.asyncapi.bindings.sqs.SQS.class, com.asyncapi.bindings.stomp.STOMP.class, -// com.asyncapi.bindings.websockets.WebSockets.class, + com.asyncapi.bindings.websockets.WebSockets.class, }) @SuiteDisplayName("Bindings") public class BindingsTest {} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSockets.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSockets.java new file mode 100644 index 00000000..bfbedab6 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSockets.java @@ -0,0 +1,10 @@ +package com.asyncapi.bindings.websockets; + +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("WebSockets") +@SelectPackages("com.asyncapi.bindings.websockets") +public class WebSockets {} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsLatestTest.java new file mode 100644 index 00000000..fc836cf3 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsLatestTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.websockets; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("latest") +public class WebSocketsLatestTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.channelBinding(); + super.bindingTypeClass = WebSocketsChannelBinding.class; + super.pathToBindingJson = "/bindings/websockets/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/latest/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.messageBinding(); + super.bindingTypeClass = WebSocketsMessageBinding.class; + super.pathToBindingJson = "/bindings/websockets/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/latest/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.operationBinding(); + super.bindingTypeClass = WebSocketsOperationBinding.class; + super.pathToBindingJson = "/bindings/websockets/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/latest/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.serverBinding(); + super.bindingTypeClass = WebSocketsServerBinding.class; + super.pathToBindingJson = "/bindings/websockets/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/latest/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsTest.java deleted file mode 100644 index 59a37e9a..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsTest.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.asyncapi.bindings.websockets; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; - -public abstract class WebSocketsTest { - - @Nested - @DisplayName("unknown version") - class UnknownVersion { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.websockets.unknownversion.channel.WebSocketsChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.websockets.unknownversion.message.WebSocketsMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.websockets.unknownversion.operation.WebSocketsOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.websockets.unknownversion.server.WebSocketsServerBindingTest {} - - } - - @Nested - @DisplayName("without version") - class WithoutVersion { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.websockets.withoutversion.channel.WebSocketsChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.websockets.withoutversion.message.WebSocketsMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.websockets.withoutversion.operation.WebSocketsOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.websockets.withoutversion.server.WebSocketsServerBindingTest {} - - } - - @Nested - @DisplayName("latest") - class Latest { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.websockets.latest.channel.WebSocketsChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.websockets.latest.message.WebSocketsMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.websockets.latest.operation.WebSocketsOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.websockets.latest.server.WebSocketsServerBindingTest {} - - } - - @Nested - @DisplayName("0.1.0") - class V0_1_0 { - - @Nested - @DisplayName("channel") - class Channel extends com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBindingTest {} - - @Nested - @DisplayName("message") - class Message extends com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBindingTest {} - - @Nested - @DisplayName("operation") - class Operation extends com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBindingTest {} - - @Nested - @DisplayName("server") - class Server extends com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBindingTest {} - - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsUnknownVersionTest.java new file mode 100644 index 00000000..0cd34df0 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsUnknownVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.websockets; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("unknown version") +public class WebSocketsUnknownVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.channelBinding(); + super.bindingTypeClass = WebSocketsChannelBinding.class; + super.pathToBindingJson = "/bindings/websockets/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/unknown version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.messageBinding(); + super.bindingTypeClass = WebSocketsMessageBinding.class; + super.pathToBindingJson = "/bindings/websockets/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/unknown version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.operationBinding(); + super.bindingTypeClass = WebSocketsOperationBinding.class; + super.pathToBindingJson = "/bindings/websockets/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/unknown version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.serverBinding(); + super.bindingTypeClass = WebSocketsServerBinding.class; + super.pathToBindingJson = "/bindings/websockets/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/unknown version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java new file mode 100644 index 00000000..af850cff --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java @@ -0,0 +1,106 @@ +package com.asyncapi.bindings.websockets; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.v3.schema.Type; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.HashMap; +import java.util.Map; + +@DisplayName("0.1.0") +public class WebSocketsV0_1_0Test { + + public static WebSocketsChannelBinding channelBinding () { + Map queryProperties = new HashMap<>(); + queryProperties.put( + "ref", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Referral.") + .build() + ); + + Map headersProperties = new HashMap<>(); + headersProperties.put( + "Authentication", + AsyncAPISchema.builder() + .type(Type.STRING) + .description("Authentication token") + .build() + ); + + return WebSocketsChannelBinding.builder() + .method(WebSocketsChannelMethod.GET) + .query(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(queryProperties) + .build() + ) + .headers(AsyncAPISchema.builder() + .type(Type.OBJECT) + .properties(headersProperties) + .build() + ) + .build(); + } + + public static WebSocketsMessageBinding messageBinding () { + return new WebSocketsMessageBinding(); + } + + public static WebSocketsOperationBinding operationBinding () { + return new WebSocketsOperationBinding(); + } + + public static WebSocketsServerBinding serverBinding () { + return new WebSocketsServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = WebSocketsChannelBinding.class; + super.pathToBindingJson = "/bindings/websockets/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = WebSocketsMessageBinding.class; + super.pathToBindingJson = "/bindings/websockets/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = WebSocketsOperationBinding.class; + super.pathToBindingJson = "/bindings/websockets/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = WebSocketsServerBinding.class; + super.pathToBindingJson = "/bindings/websockets/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsWithoutVersionTest.java new file mode 100644 index 00000000..734d1ada --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsWithoutVersionTest.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.websockets; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; +import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; +import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; +import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("without version") +public class WebSocketsWithoutVersionTest { + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.channelBinding(); + super.bindingTypeClass = WebSocketsChannelBinding.class; + super.pathToBindingJson = "/bindings/websockets/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/without version/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.messageBinding(); + super.bindingTypeClass = WebSocketsMessageBinding.class; + super.pathToBindingJson = "/bindings/websockets/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/without version/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.operationBinding(); + super.bindingTypeClass = WebSocketsOperationBinding.class; + super.pathToBindingJson = "/bindings/websockets/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/without version/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = WebSocketsV0_1_0Test.serverBinding(); + super.bindingTypeClass = WebSocketsServerBinding.class; + super.pathToBindingJson = "/bindings/websockets/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/websockets/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/websockets/without version/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/channel/WebSocketsChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/channel/WebSocketsChannelBindingTest.java deleted file mode 100644 index 9d210c7c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/channel/WebSocketsChannelBindingTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.asyncapi.bindings.websockets.latest.channel; - -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod; -import com.asyncapi.v3.SerDeTest; -import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; -import org.jetbrains.annotations.NotNull; - -import java.util.HashMap; -import java.util.Map; - -public abstract class WebSocketsChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/latest/channel/webSocketsChannelBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/latest/channel/webSocketsChannelBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/latest/channel/webSocketsChannelBinding - wrongly extended.json"; - } - - @NotNull - @Override - public WebSocketsChannelBinding build() { - Map queryProperties = new HashMap<>(); - queryProperties.put( - "ref", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Referral.") - .build() - ); - - Map headersProperties = new HashMap<>(); - headersProperties.put( - "Authentication", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Authentication token") - .build() - ); - - return WebSocketsChannelBinding.builder() - .method(WebSocketsChannelMethod.GET) - .query(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(queryProperties) - .build() - ) - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(headersProperties) - .build() - ) - .build(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/message/WebSocketsMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/message/WebSocketsMessageBindingTest.java deleted file mode 100644 index 16a6146a..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/message/WebSocketsMessageBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.websockets.latest.message; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/latest/message/webSocketsMessageBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/latest/message/webSocketsMessageBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/latest/message/webSocketsMessageBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsMessageBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/operation/WebSocketsOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/operation/WebSocketsOperationBindingTest.java deleted file mode 100644 index 2655e6a2..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/operation/WebSocketsOperationBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.websockets.latest.operation; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/latest/operation/webSocketsOperationBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/latest/operation/webSocketsOperationBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/latest/operation/webSocketsOperationBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsOperationBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/server/WebSocketsServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/server/WebSocketsServerBindingTest.java deleted file mode 100644 index 243254e2..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/latest/server/WebSocketsServerBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.websockets.latest.server; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/latest/server/webSocketsServerBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/latest/server/webSocketsServerBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/channel/WebSocketsChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/channel/WebSocketsChannelBindingTest.java deleted file mode 100644 index f53fbb8e..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/channel/WebSocketsChannelBindingTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.asyncapi.bindings.websockets.unknownversion.channel; - -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod; -import com.asyncapi.v3.SerDeTest; -import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; -import org.jetbrains.annotations.NotNull; - -import java.util.HashMap; -import java.util.Map; - -public abstract class WebSocketsChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/unknown version/channel/webSocketsChannelBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/unknown version/channel/webSocketsChannelBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/unknown version/channel/webSocketsChannelBinding - wrongly extended.json"; - } - - @NotNull - @Override - public WebSocketsChannelBinding build() { - Map queryProperties = new HashMap<>(); - queryProperties.put( - "ref", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Referral.") - .build() - ); - - Map headersProperties = new HashMap<>(); - headersProperties.put( - "Authentication", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Authentication token") - .build() - ); - - return WebSocketsChannelBinding.builder() - .method(WebSocketsChannelMethod.GET) - .query(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(queryProperties) - .build() - ) - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(headersProperties) - .build() - ) - .build(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/message/WebSocketsMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/message/WebSocketsMessageBindingTest.java deleted file mode 100644 index 832bac40..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/message/WebSocketsMessageBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.websockets.unknownversion.message; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/unknown version/message/webSocketsMessageBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/unknown version/message/webSocketsMessageBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/unknown version/message/webSocketsMessageBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsMessageBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/operation/WebSocketsOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/operation/WebSocketsOperationBindingTest.java deleted file mode 100644 index 0f93bed1..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/operation/WebSocketsOperationBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.websockets.unknownversion.operation; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/unknown version/operation/webSocketsOperationBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/unknown version/operation/webSocketsOperationBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/unknown version/operation/webSocketsOperationBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsOperationBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/server/WebSocketsServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/server/WebSocketsServerBindingTest.java deleted file mode 100644 index 6bb45d05..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/unknownversion/server/WebSocketsServerBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.websockets.unknownversion.server; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/unknown version/server/webSocketsServerBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/unknown version/server/webSocketsServerBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/unknown version/server/webSocketsServerBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/WebSocketsBindingProvider.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/WebSocketsBindingProvider.java deleted file mode 100644 index 08f18445..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/WebSocketsBindingProvider.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.asyncapi.bindings.websockets.v0._1_0; - -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod; -import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; -import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; -import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; - -import java.util.HashMap; -import java.util.Map; - -public class WebSocketsBindingProvider { - - public static WebSocketsChannelBinding channel() { - Map queryProperties = new HashMap<>(); - queryProperties.put( - "ref", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Referral.") - .build() - ); - - Map headersProperties = new HashMap<>(); - headersProperties.put( - "Authentication", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Authentication token") - .build() - ); - - return WebSocketsChannelBinding.builder() - .method(WebSocketsChannelMethod.GET) - .query(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(queryProperties) - .build() - ) - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(headersProperties) - .build() - ) - .build(); - } - - public static WebSocketsMessageBinding message() { - return new WebSocketsMessageBinding(); - } - - public static WebSocketsOperationBinding operation() { - return new WebSocketsOperationBinding(); - } - - public static WebSocketsServerBinding server() { - return new WebSocketsServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.java deleted file mode 100644 index 8d68f2da..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBindingTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.asyncapi.bindings.websockets.v0._1_0.channel; - -import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Nested; - -@Nested -public abstract class WebSocketsChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/0.1.0/channel/webSocketsChannelBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - wrongly extended.json"; - } - - @NotNull - @Override - public WebSocketsChannelBinding build() { - return WebSocketsBindingProvider.channel(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBindingTest.java deleted file mode 100644 index ec637d9c..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.websockets.v0._1_0.message; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/0.1.0/message/webSocketsMessageBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/0.1.0/message/webSocketsMessageBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/0.1.0/message/webSocketsMessageBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsMessageBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBindingTest.java deleted file mode 100644 index 9d6522c8..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.websockets.v0._1_0.operation; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/0.1.0/operation/webSocketsOperationBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsOperationBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBindingTest.java deleted file mode 100644 index d2308147..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBindingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.websockets.v0._1_0.server; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/0.1.0/server/webSocketsServerBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/channel/WebSocketsChannelBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/channel/WebSocketsChannelBindingTest.java deleted file mode 100644 index f66190b7..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/channel/WebSocketsChannelBindingTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.asyncapi.bindings.websockets.withoutversion.channel; - -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding; -import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelMethod; -import com.asyncapi.v3.SerDeTest; -import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; -import org.jetbrains.annotations.NotNull; - -import java.util.HashMap; -import java.util.Map; - -public abstract class WebSocketsChannelBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsChannelBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/without version/channel/webSocketsChannelBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/without version/channel/webSocketsChannelBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/without version/channel/webSocketsChannelBinding - wrongly extended.json"; - } - - @NotNull - @Override - public WebSocketsChannelBinding build() { - Map queryProperties = new HashMap<>(); - queryProperties.put( - "ref", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Referral.") - .build() - ); - - Map headersProperties = new HashMap<>(); - headersProperties.put( - "Authentication", - AsyncAPISchema.builder() - .type(Type.STRING) - .description("Authentication token") - .build() - ); - - return WebSocketsChannelBinding.builder() - .method(WebSocketsChannelMethod.GET) - .query(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(queryProperties) - .build() - ) - .headers(AsyncAPISchema.builder() - .type(Type.OBJECT) - .properties(headersProperties) - .build() - ) - .build(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/message/WebSocketsMessageBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/message/WebSocketsMessageBindingTest.java deleted file mode 100644 index 09cb04c1..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/message/WebSocketsMessageBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.websockets.withoutversion.message; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsMessageBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsMessageBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/without version/message/webSocketsMessageBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/without version/message/webSocketsMessageBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/without version/message/webSocketsMessageBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsMessageBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/operation/WebSocketsOperationBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/operation/WebSocketsOperationBindingTest.java deleted file mode 100644 index d43bf745..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/operation/WebSocketsOperationBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.websockets.withoutversion.operation; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsOperationBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsOperationBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/without version/operation/webSocketsOperationBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/without version/operation/webSocketsOperationBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/without version/operation/webSocketsOperationBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsOperationBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/server/WebSocketsServerBindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/server/WebSocketsServerBindingTest.java deleted file mode 100644 index 16643a48..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/withoutversion/server/WebSocketsServerBindingTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.asyncapi.bindings.websockets.withoutversion.server; - -import com.asyncapi.ExtendableObject; -import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; -import com.asyncapi.v3.SerDeTest; -import org.jetbrains.annotations.NotNull; - -public abstract class WebSocketsServerBindingTest extends SerDeTest { - - @NotNull - @Override - protected Class objectClass() { - return WebSocketsServerBinding.class; - } - - @NotNull - @Override - protected String baseObjectJson() { - return "/bindings/websockets/without version/server/webSocketsServerBinding.json"; - } - - @NotNull - @Override - protected String extendedObjectJson() { - return "/bindings/websockets/without version/server/webSocketsServerBinding - extended.json"; - } - - @NotNull - @Override - protected String wronglyExtendedObjectJson() { - return "/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json"; - } - - @NotNull - @Override - public ExtendableObject build() { - return new WebSocketsServerBinding(); - } - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 700932c6..35251c99 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -23,7 +23,7 @@ import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding -import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider +import com.asyncapi.bindings.websockets.WebSocketsV0_1_0Test class ChannelItemTest: SerDeTest() { @@ -73,7 +73,7 @@ class ChannelItemTest: SerDeTest() { Pair("solace", SolaceChannelBinding()), Pair("sqs", SQSChannelBinding()), Pair("stomp", STOMPChannelBinding()), - Pair("ws", WebSocketsBindingProvider.channel()) + Pair("ws", WebSocketsV0_1_0Test.channelBinding()) ) } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 22655f59..647b5a30 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test -import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider +import com.asyncapi.bindings.websockets.WebSocketsV0_1_0Test class ChannelItemTest: SerDeTest() { @@ -62,7 +62,7 @@ class ChannelItemTest: SerDeTest() { Pair("solace", Reference("#/components/channelBindings/solace")), Pair("sqs", Reference("#/components/channelBindings/sqs")), Pair("stomp", Reference("#/components/channelBindings/stomp")), - Pair("ws", WebSocketsBindingProvider.channel()) + Pair("ws", WebSocketsV0_1_0Test.channelBinding()) ) } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 85804602..af2ccaf1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test -import com.asyncapi.bindings.websockets.v0._1_0.WebSocketsBindingProvider +import com.asyncapi.bindings.websockets.WebSocketsV0_1_0Test class ChannelTest: SerDeTest() { @@ -82,7 +82,7 @@ class ChannelTest: SerDeTest() { Pair("solace", Reference("#/components/channelBindings/solace")), Pair("sqs", Reference("#/components/channelBindings/sqs")), Pair("stomp", Reference("#/components/channelBindings/stomp")), - Pair("ws", WebSocketsBindingProvider.channel()) + Pair("ws", WebSocketsV0_1_0Test.channelBinding()) ) } } @@ -155,7 +155,7 @@ class ChannelTestWithReference: SerDeTest() { Pair("solace", Reference("#/components/channelBindings/solace")), Pair("sqs", Reference("#/components/channelBindings/sqs")), Pair("stomp", Reference("#/components/channelBindings/stomp")), - Pair("ws", WebSocketsBindingProvider.channel()) + Pair("ws", WebSocketsV0_1_0Test.channelBinding()) ) } } diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/webSocketsChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/webSocketsMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/webSocketsOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/webSocketsServerBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/0.1.0/server/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/latest/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/latest/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/channel/webSocketsChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/latest/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/message/webSocketsMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/latest/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/latest/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/latest/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/operation/webSocketsOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/latest/server/webSocketsServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/latest/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/webSocketsChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/webSocketsMessageBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/webSocketsOperationBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/operation/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/webSocketsServerBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/unknown version/server/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/channel/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/channel/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/channel/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/channel/webSocketsChannelBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/channel/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/message/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/message/webSocketsMessageBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/message/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/message/binding - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - wrongly extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/message/binding - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/message/binding.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/message/binding.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/operation/webSocketsOperationBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/operation/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/bindings/websockets/without version/server/webSocketsServerBinding - extended.json rename to asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding - extended.json diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/websockets/without version/server/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file From 9910e2da48e229fc51022ee3498cc6daa436ef71 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 1 May 2024 23:33:05 +0400 Subject: [PATCH 065/141] test(bindings): remove bindingVersion from without version test resources https://github.com/asyncapi/jasyncapi/issues/184 --- .../without version/operation/binding - wrongly extended.json | 1 - .../without version/channel/binding - wrongly extended.json | 1 - .../googlepubsub/without version/channel/binding.json | 3 +-- .../without version/message/binding - wrongly extended.json | 1 - .../googlepubsub/without version/message/binding.json | 3 +-- .../without version/operation/binding - wrongly extended.json | 1 - .../googlepubsub/without version/operation/binding.json | 4 +--- .../without version/server/binding - wrongly extended.json | 1 - .../bindings/googlepubsub/without version/server/binding.json | 4 +--- .../without version/channel/binding - wrongly extended.json | 1 - .../bindings/http/without version/channel/binding.json | 4 +--- .../without version/message/binding - wrongly extended.json | 1 - .../bindings/http/without version/message/binding.json | 3 +-- .../without version/operation/binding - wrongly extended.json | 1 - .../bindings/http/without version/operation/binding.json | 3 +-- .../without version/server/binding - wrongly extended.json | 1 - .../bindings/http/without version/server/binding.json | 4 +--- .../without version/channel/binding - wrongly extended.json | 1 - .../bindings/ibmmq/without version/channel/binding.json | 3 +-- .../without version/message/binding - wrongly extended.json | 1 - .../bindings/ibmmq/without version/message/binding.json | 3 +-- .../without version/operation/binding - wrongly extended.json | 1 - .../bindings/ibmmq/without version/operation/binding.json | 4 +--- .../without version/server/binding - wrongly extended.json | 1 - .../bindings/ibmmq/without version/server/binding.json | 3 +-- .../without version/channel/binding - wrongly extended.json | 1 - .../bindings/jms/without version/channel/binding.json | 3 +-- .../without version/message/binding - wrongly extended.json | 1 - .../bindings/jms/without version/message/binding.json | 3 +-- .../without version/operation/binding - wrongly extended.json | 1 - .../bindings/jms/without version/operation/binding.json | 4 +--- .../without version/server/binding - wrongly extended.json | 1 - .../bindings/jms/without version/server/binding.json | 3 +-- .../without version/channel/binding - wrongly extended.json | 1 - .../bindings/kafka/without version/channel/binding.json | 3 +-- .../without version/message/binding - wrongly extended.json | 1 - .../bindings/kafka/without version/message/binding.json | 3 +-- .../without version/operation/binding - wrongly extended.json | 1 - .../bindings/kafka/without version/operation/binding.json | 3 +-- .../without version/server/binding - wrongly extended.json | 1 - .../bindings/kafka/without version/server/binding.json | 3 +-- .../without version/channel/binding - wrongly extended.json | 1 - .../bindings/mqtt/without version/channel/binding.json | 4 +--- .../without version/message/binding - wrongly extended.json | 1 - .../bindings/mqtt/without version/message/binding.json | 4 +--- .../without version/operation/binding - wrongly extended.json | 1 - .../bindings/mqtt/without version/operation/binding.json | 3 +-- .../without version/server/binding - wrongly extended.json | 1 - .../bindings/mqtt/without version/server/binding.json | 3 +-- .../without version/channel/binding - wrongly extended.json | 1 - .../bindings/mqtt5/without version/channel/binding.json | 4 +--- .../without version/message/binding - wrongly extended.json | 1 - .../bindings/mqtt5/without version/message/binding.json | 4 +--- .../without version/operation/binding - wrongly extended.json | 1 - .../bindings/mqtt5/without version/operation/binding.json | 4 +--- .../without version/server/binding - wrongly extended.json | 1 - .../bindings/mqtt5/without version/server/binding.json | 3 +-- .../without version/operation/binding - wrongly extended.json | 1 - .../bindings/nats/without version/operation/binding.json | 3 +-- .../without version/channel/binding - wrongly extended.json | 1 - .../bindings/pulsar/without version/channel/binding.json | 3 +-- .../without version/message/binding - wrongly extended.json | 1 - .../bindings/pulsar/without version/message/binding.json | 4 +--- .../without version/operation/binding - wrongly extended.json | 1 - .../bindings/pulsar/without version/operation/binding.json | 4 +--- .../without version/server/binding - wrongly extended.json | 1 - .../bindings/pulsar/without version/server/binding.json | 3 +-- 67 files changed, 33 insertions(+), 113 deletions(-) diff --git a/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - wrongly extended.json index 61ff2d82..528096f6 100644 --- a/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/amqp/without version/operation/binding - wrongly extended.json @@ -12,7 +12,6 @@ ], "timestamp": true, "ack": false, - "bindingVersion": "0.3.0", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - wrongly extended.json index e9e254e3..c62aa6d3 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding - wrongly extended.json @@ -19,7 +19,6 @@ "encoding": "binary", "name": "projects/your-project/schemas/message-proto" }, - "bindingVersion": "0.2.0", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding.json index a92cc1f3..559ff61c 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/channel/binding.json @@ -18,6 +18,5 @@ "schemaSettings": { "encoding": "binary", "name": "projects/your-project/schemas/message-proto" - }, - "bindingVersion": "without version" + } } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - wrongly extended.json index 11ec3f59..239ed2c0 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding - wrongly extended.json @@ -2,7 +2,6 @@ "schema": { "name": "projects/your-project/schemas/message-avro" }, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding.json index 45b7bd7f..9b23d2c6 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/message/binding.json @@ -1,6 +1,5 @@ { "schema": { "name": "projects/your-project/schemas/message-avro" - }, - "bindingVersion": "without version" + } } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/operation/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/googlepubsub/without version/server/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding.json +++ b/asyncapi-core/src/test/resources/bindings/http/without version/channel/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - wrongly extended.json index ee24526c..6f2aff25 100644 --- a/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding - wrongly extended.json @@ -11,7 +11,6 @@ } }, "statusCode": 200, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding.json index d60969fa..c498550c 100644 --- a/asyncapi-core/src/test/resources/bindings/http/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/http/without version/message/binding.json @@ -10,6 +10,5 @@ } } }, - "statusCode": 200, - "bindingVersion": "without version" + "statusCode": 200 } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - wrongly extended.json index 7b223911..3fdbe609 100644 --- a/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding - wrongly extended.json @@ -14,7 +14,6 @@ }, "additionalProperties": false }, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding.json index 8ba98984..d2da9b72 100644 --- a/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/http/without version/operation/binding.json @@ -13,6 +13,5 @@ } }, "additionalProperties": false - }, - "bindingVersion": "without version" + } } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/http/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/http/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/http/without version/server/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - wrongly extended.json index fbf1e1c5..de15130c 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding - wrongly extended.json @@ -12,7 +12,6 @@ "lastMsgRetained": true }, "maxMsgLength": 1024, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding.json index ff4c3ce0..4d1e1c7e 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/channel/binding.json @@ -11,6 +11,5 @@ "durablePermitted": true, "lastMsgRetained": true }, - "maxMsgLength": 1024, - "bindingVersion": "without version" + "maxMsgLength": 1024 } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - wrongly extended.json index 2029f4ba..96a0f6a9 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding - wrongly extended.json @@ -3,7 +3,6 @@ "description": "JMS stream message", "headers": "Content-Type: application/json", "expiry": 0, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding.json index c57f07b2..b8d11da2 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/message/binding.json @@ -2,6 +2,5 @@ "type": "jms", "description": "JMS stream message", "headers": "Content-Type: application/json", - "expiry": 0, - "bindingVersion": "without version" + "expiry": 0 } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/operation/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - wrongly extended.json index aa92ec23..968669a0 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding - wrongly extended.json @@ -4,7 +4,6 @@ "multiEndpointServer": false, "heartBeatInterval": 300, "cipherSpec": "ANY_TLS12_OR_HIGHER", - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding.json index 155437bd..4a81f8e8 100644 --- a/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/ibmmq/without version/server/binding.json @@ -3,6 +3,5 @@ "ccdtQueueManagerName": "*", "multiEndpointServer": false, "heartBeatInterval": 300, - "cipherSpec": "ANY_TLS12_OR_HIGHER", - "bindingVersion": "without version" + "cipherSpec": "ANY_TLS12_OR_HIGHER" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - wrongly extended.json index 62e3d960..9acdfb5d 100644 --- a/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding - wrongly extended.json @@ -1,7 +1,6 @@ { "destination": "user-signed-up", "destinationType": "fifo-queue", - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding.json index 010bbb31..c3fe7ac9 100644 --- a/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding.json +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/channel/binding.json @@ -1,5 +1,4 @@ { "destination": "user-signed-up", - "destinationType": "fifo-queue", - "bindingVersion": "without version" + "destinationType": "fifo-queue" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - wrongly extended.json index 773ec110..659caf75 100644 --- a/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding - wrongly extended.json @@ -40,7 +40,6 @@ } } }, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding.json index a3907fb7..022d8894 100644 --- a/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/message/binding.json @@ -39,6 +39,5 @@ "description": "The queue or topic that the message sender expects replies to." } } - }, - "bindingVersion": "without version" + } } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/operation/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - wrongly extended.json index 6902e97c..277cb00b 100644 --- a/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "jmsConnectionFactory": "org.apache.activemq.ActiveMQConnectionFactory", "properties": [ { diff --git a/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding.json index cfe06d6c..003cf750 100644 --- a/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/jms/without version/server/binding.json @@ -6,6 +6,5 @@ "value": false } ], - "clientID": "my-application-1", - "bindingVersion": "without version" + "clientID": "my-application-1" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - wrongly extended.json index 3a85e13d..57d3db25 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - wrongly extended.json @@ -12,7 +12,6 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding.json index 0e34633c..9e93a580 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding.json @@ -11,6 +11,5 @@ "retention.bytes": 1000000000, "delete.retention.ms": 86400000, "max.message.bytes": 1048588 - }, - "bindingVersion": "without version" + } } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - wrongly extended.json index 9ca25de8..e402fbb0 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - wrongly extended.json @@ -8,7 +8,6 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding.json index 64eef8fa..1be17637 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding.json @@ -7,6 +7,5 @@ }, "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", - "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "without version" + "schemaLookupStrategy": "TopicIdStrategy" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - wrongly extended.json index 0f039bd9..81ceb205 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - wrongly extended.json @@ -11,7 +11,6 @@ "myClientId" ] }, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding.json index e11e2a46..dfdc6f7e 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding.json @@ -10,6 +10,5 @@ "enum": [ "myClientId" ] - }, - "bindingVersion": "without version" + } } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - wrongly extended.json index cddc4644..a78d9e71 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - wrongly extended.json @@ -1,7 +1,6 @@ { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding.json index 7de76a74..2c3285a7 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding.json @@ -1,5 +1,4 @@ { "schemaRegistryUrl": "https://my-schema-registry.com", - "schemaRegistryVendor": "confluent", - "bindingVersion": "without version" + "schemaRegistryVendor": "confluent" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json index 2d2554ae..b2185d3f 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json @@ -1,7 +1,6 @@ { "qos": 2, "retain": true, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json index 159d6662..7aed757d 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json @@ -1,5 +1,4 @@ { "qos": 2, - "retain": true, - "bindingVersion": "without version" + "retain": true } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json index 80e3b420..25917eec 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json @@ -8,7 +8,6 @@ "retain": false }, "keepAlive": 60, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json index 714d8d26..75f11bd1 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json @@ -7,6 +7,5 @@ "message": "Guest gone offline.", "retain": false }, - "keepAlive": 60, - "bindingVersion": "without version" + "keepAlive": 60 } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - wrongly extended.json index 0dee3264..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "unknown version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding.json index defc96bf..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/channel/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "unknown version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - wrongly extended.json index 0dee3264..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "unknown version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding.json index defc96bf..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/message/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "unknown version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - wrongly extended.json index 0dee3264..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "unknown version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding.json index defc96bf..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/operation/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "unknown version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - wrongly extended.json index 97f17911..4ac2bf74 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding - wrongly extended.json @@ -1,6 +1,5 @@ { "sessionExpiryInterval": 60, - "bindingVersion": "unknown version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding.json index 02fc5dc0..91980fc8 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt5/without version/server/binding.json @@ -1,4 +1,3 @@ { - "sessionExpiryInterval": 60, - "bindingVersion": "unknown version" + "sessionExpiryInterval": 60 } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - wrongly extended.json index 0c99fecc..6772a890 100644 --- a/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding - wrongly extended.json @@ -1,6 +1,5 @@ { "queue": "messages", - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding.json index 5964edad..00ed97cf 100644 --- a/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/nats/without version/operation/binding.json @@ -1,4 +1,3 @@ { - "queue": "messages", - "bindingVersion": "without version" + "queue": "messages" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - wrongly extended.json index fda22968..2900ae0b 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding - wrongly extended.json @@ -12,7 +12,6 @@ }, "ttl": 360, "deduplication": false, - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding.json index d78ebc71..7c2a75ea 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/channel/binding.json @@ -11,6 +11,5 @@ "size": 1000 }, "ttl": 360, - "deduplication": false, - "bindingVersion": "without version" + "deduplication": false } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/message/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - wrongly extended.json index 7365f2b2..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding.json index 0c27f736..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/operation/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion": "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - wrongly extended.json index 3141ac40..67ac5d9c 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding - wrongly extended.json @@ -1,6 +1,5 @@ { "tenant": "contoso", - "bindingVersion": "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding.json index 10521b8c..ff77273f 100644 --- a/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/pulsar/without version/server/binding.json @@ -1,4 +1,3 @@ { - "tenant": "contoso", - "bindingVersion": "without version" + "tenant": "contoso" } \ No newline at end of file From a90d26bd24d2adcc3559c8bc45124b4acc60f95d Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:14:17 +0400 Subject: [PATCH 066/141] build: fix javadocs https://github.com/asyncapi/jasyncapi/issues/184 --- .../model/schema/SchemasAdditionalPropertiesDeserializer.java | 2 ++ .../model/schema/SchemasAdditionalPropertiesDeserializer.java | 2 ++ asyncapi-core/src/main/java/com/asyncapi/v2/schema/Type.java | 2 ++ .../com/asyncapi/v2/security_scheme/ApiKeySecurityScheme.java | 2 ++ .../v2/security_scheme/OpenIdConnectSecurityScheme.java | 2 ++ .../v2/security_scheme/http/HttpApiKeySecurityScheme.java | 2 ++ .../asyncapi/v2/security_scheme/http/HttpSecurityScheme.java | 2 ++ .../v2/security_scheme/oauth2/OAuth2SecurityScheme.java | 2 ++ .../oauth2/flow/ClientCredentialsOAuthFlow.java | 4 ++++ .../v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java | 4 ++++ .../v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java | 4 ++++ .../AsyncAPISchemaAdditionalPropertiesDeserializer.java | 2 ++ .../v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java | 2 ++ .../v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java | 3 +++ .../v3/jackson/schema/JsonSchemaAnyValueDeserializer.java | 2 ++ .../v3/jackson/schema/JsonSchemaItemsDeserializer.java | 3 +++ .../v3/jackson/schema/JsonSchemaPropertiesDeserializer.java | 2 ++ .../v3/jackson/schema/SchemaAnyValueDeserializer.java | 3 +++ .../OpenAPISchemaAdditionalPropertiesDeserializer.java | 2 ++ .../schema/openapi/OpenAPISchemaAnyValueDeserializer.java | 2 ++ asyncapi-core/src/main/java/com/asyncapi/v3/schema/Type.java | 2 ++ .../com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaArray.java | 2 ++ .../com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaFixed.java | 2 ++ .../v3/schema/avro/v1/_9_0/AvroSchemaLogicalType.java | 3 +++ .../com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMap.java | 2 ++ .../asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMetadata.java | 3 +++ .../com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java | 1 + .../com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchema.java | 4 ++-- .../v3/schema/openapi/v3/_0_0/properties/Extensions.java | 2 ++ 29 files changed, 68 insertions(+), 2 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java index a02e585e..59ca2650 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java @@ -11,6 +11,8 @@ import java.io.IOException; /** + * Deserialize Schema additional properties + * * @author Guillaume LAMIRAND (guillaume.lamirand at graviteesource.com) * @author GraviteeSource Team */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java index 8cc6e9ec..0f1cce06 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java @@ -11,6 +11,8 @@ import java.io.IOException; /** + * Deserialize Schema additional properties + * * @author Guillaume LAMIRAND (guillaume.lamirand at graviteesource.com) * @author GraviteeSource Team */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Type.java b/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Type.java index 1a0572aa..8b417e62 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Type.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Type.java @@ -1,6 +1,8 @@ package com.asyncapi.v2.schema; /** + * Json Schema type. + * * @author Pavel Bodiachevskii */ public class Type { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/ApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/ApiKeySecurityScheme.java index f9dd75d4..81c899ba 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/ApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/ApiKeySecurityScheme.java @@ -10,6 +10,8 @@ import org.jetbrains.annotations.Nullable; /** + * API Key Security Scheme + * * @version 2.6.0 * @see SecurityScheme * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/OpenIdConnectSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/OpenIdConnectSecurityScheme.java index e1e52549..561e58d2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/OpenIdConnectSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/OpenIdConnectSecurityScheme.java @@ -9,6 +9,8 @@ import org.jetbrains.annotations.Nullable; /** + * OpenID Connect Security Scheme + * * @version 2.6.0 * @see SecurityScheme * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpApiKeySecurityScheme.java index 13786bae..9d8e0f12 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpApiKeySecurityScheme.java @@ -11,6 +11,8 @@ import org.jetbrains.annotations.Nullable; /** + * HTTP API Key Security Scheme + * * @version 2.6.0 * @see SecurityScheme * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpSecurityScheme.java index 63b77d0a..e6178101 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpSecurityScheme.java @@ -10,6 +10,8 @@ import org.jetbrains.annotations.Nullable; /** + * HTTP Security Scheme + * * @version 2.6.0 * @see SecurityScheme * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecurityScheme.java index 7bb2b660..c8a009c8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecurityScheme.java @@ -10,6 +10,8 @@ import org.jetbrains.annotations.Nullable; /** + * OAuth2 Security Scheme + * * @version 2.6.0 * @see SecurityScheme * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java index 15e05e07..0d538bf3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -11,6 +11,10 @@ import java.util.Map; /** + * Configuration for the OAuth Client Credentials flow + *

+ * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * * @version 2.6.0 * @see OAuth Flow Object * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java index 6518da51..4d88aa52 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java @@ -11,6 +11,10 @@ import java.util.Map; /** + * Configuration for the OAuth Implicit flow + *

+ * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * * @version 2.6.0 * @see OAuth Flow Object * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java index 693d219c..54345b50 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java @@ -11,6 +11,10 @@ import java.util.Map; /** + * Configuration for the OAuth Resource Owner Protected Credentials flow + *

+ * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * * @version 2.6.0 * @see OAuth Flow Object * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java index 0e751265..87e2e636 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java @@ -11,6 +11,8 @@ import java.io.IOException; /** + * AsyncAPI Schema additional properties deserializer + * * @author Guillaume LAMIRAND (guillaume.lamirand at graviteesource.com) * @author GraviteeSource Team */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java index 6934993a..d64884d0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java @@ -3,6 +3,8 @@ import com.asyncapi.v3.schema.AsyncAPISchema; /** + * AsyncAPI Schema any value deserializer + * * @author Pavel Bodiachevskii */ public class AsyncAPISchemaAnyValueDeserializer extends SchemaAnyValueDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java index 8b1f4fcd..2bad7eb6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java @@ -14,6 +14,9 @@ import java.util.ArrayList; import java.util.List; +/** + * AsyncAPI Schema items deserializer + */ public class AsyncAPISchemaItemsDeserializer extends SchemaItemsDeserializer { public Class schemaClass() { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java index cd25811b..bc0d5e48 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java @@ -3,6 +3,8 @@ import com.asyncapi.v3.schema.JsonSchema; /** + * Json Schema any value deserializer + * * @author Pavel Bodiachevskii */ public class JsonSchemaAnyValueDeserializer extends SchemaAnyValueDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java index bd097e7c..2ec9c9f5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java @@ -3,6 +3,9 @@ import com.asyncapi.v3.jackson.SchemaItemsDeserializer; import com.asyncapi.v3.schema.JsonSchema; +/** + * Json Schema items deserializer + */ public class JsonSchemaItemsDeserializer extends SchemaItemsDeserializer { public Class schemaClass() { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java index 71402943..73830158 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java @@ -11,6 +11,8 @@ import java.io.IOException; /** + * Json Schema properties deserializer. + * * @author Guillaume LAMIRAND (guillaume.lamirand at graviteesource.com) * @author GraviteeSource Team */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/SchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/SchemaAnyValueDeserializer.java index 09ca14d0..8cb91a10 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/SchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/SchemaAnyValueDeserializer.java @@ -14,6 +14,9 @@ import java.util.List; /** + * Abstract Schema any value deserializer + * + * @param schema to deserialize * @author Pavel Bodiachevskii */ public abstract class SchemaAnyValueDeserializer extends JsonDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java index faa5c83b..34828aad 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java @@ -11,6 +11,8 @@ import java.io.IOException; /** + * OpenAPI Schema additional properties deserializer + * * @author Pavel Bodiachevskii * @version 3.0.0 */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java index 1dd7a133..1d09695f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java @@ -4,6 +4,8 @@ import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema; /** + * OpenAPI Schema any value deserializer + * * @author Pavel Bodiachevskii */ public class OpenAPISchemaAnyValueDeserializer extends SchemaAnyValueDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/Type.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/Type.java index 957e6b30..653130e5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/Type.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/Type.java @@ -1,6 +1,8 @@ package com.asyncapi.v3.schema; /** + * Json Schema type. + * * @author Pavel Bodiachevskii */ public class Type { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaArray.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaArray.java index a51a1c4e..7adbf8c1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaArray.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaArray.java @@ -13,6 +13,8 @@ import java.util.Map; /** + * Avro Array Schema + * * @see Arrays */ @Data diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaFixed.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaFixed.java index 18e8abc9..3ab8ba2c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaFixed.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaFixed.java @@ -10,6 +10,8 @@ import java.util.Map; /** + * Avro Fixed Schema + * * @see Arrays */ @Data diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaLogicalType.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaLogicalType.java index 98f4dd8f..78b72fcd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaLogicalType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaLogicalType.java @@ -2,6 +2,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; +/** + * Avro Schema logical types + */ public class AvroSchemaLogicalType { @JsonProperty("decimal") diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMap.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMap.java index 1ab2667f..80d1c363 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMap.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMap.java @@ -12,6 +12,8 @@ import java.util.Map; /** + * Avro Map Schema + * * @see Maps */ @Data diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMetadata.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMetadata.java index 0299cf7c..52585f11 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMetadata.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMetadata.java @@ -9,6 +9,9 @@ import java.util.HashMap; import java.util.Map; +/** + * Avro Schema metadata + */ @Data @JsonIgnoreProperties({"metadata"}) public class AvroSchemaMetadata { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java index dd5720ca..801f9c2b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java @@ -14,6 +14,7 @@ * The Multi Format Schema Object represents a schema definition. It differs from the {@link AsyncAPISchema} in that it supports * multiple schema formats or languages (e.g., JSON Schema, Avro, etc.). * + * @param schema to use * @see Multi Format Schema * @see Schema * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchema.java index 97f365d3..5f3af15a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchema.java @@ -109,7 +109,7 @@ public class OpenAPISchema extends Extensions { /** * The word “exclusive” in {@link #exclusiveMinimum} and {@link #exclusiveMaximum} means the corresponding boundary is excluded: - * + *
* * * @@ -166,7 +166,7 @@ public class OpenAPISchema extends Extensions { /** * The word “exclusive” in {@link #exclusiveMinimum} and {@link #exclusiveMaximum} means the corresponding boundary is excluded: - *
KeywordDescription
+ *
* * * diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Extensions.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Extensions.java index b243003f..02eaee88 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Extensions.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Extensions.java @@ -13,6 +13,8 @@ import java.util.regex.Pattern; /** + * Allows to extend AsyncAPI specification + * * @see Specification Extensions */ @Data From b5180ca5c5ebda63b06775dc448cb609c49d2c53 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:15:01 +0400 Subject: [PATCH 067/141] build: switch to Java 21 for testing and bump dependencies https://github.com/asyncapi/jasyncapi/issues/184 --- .idea/kotlinc.xml | 2 +- .sdkmanrc | 4 +-- asyncapi-core/pom.xml | 5 ---- pom.xml | 61 +++++++++++++++++++++++-------------------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 2b8a50fc..fe63bb67 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.sdkmanrc b/.sdkmanrc index b9c96b0b..66f98085 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,2 +1,2 @@ -java=8.0.362-amzn -maven=3.9.0 \ No newline at end of file +java=21.0.2-amzn +maven=3.9.6 \ No newline at end of file diff --git a/asyncapi-core/pom.xml b/asyncapi-core/pom.xml index c9292752..845eaae4 100644 --- a/asyncapi-core/pom.xml +++ b/asyncapi-core/pom.xml @@ -27,11 +27,6 @@ provided - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - test - org.jetbrains.kotlin kotlin-test diff --git a/pom.xml b/pom.xml index 8dea0cb0..20f0a813 100644 --- a/pom.xml +++ b/pom.xml @@ -49,13 +49,21 @@ - 1.8.0 - 2.14.2 - 1.8 - 1.18.26 - 5.9.2 + 1.9.23 + 2.17.0 + 1.18.32 + 5.10.2 1.7.0 UTF-8 + + + 3.2.0 + 1.8 + 21 + ${jdk.version} + ${jdk.version} + ${jdk-test.version} + ${jdk-test.version} @@ -84,17 +92,17 @@ 1.10.2 test + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - org.jetbrains.kotlin kotlin-test @@ -105,7 +113,7 @@ org.projectlombok lombok - 1.18.10 + ${lombok.version} @@ -154,7 +162,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 attach-sources @@ -167,7 +175,10 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.3 + + missing + attach-javadocs @@ -211,32 +222,26 @@ - ${java.version} + ${jdk-test.version} org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 + maven-toolchains-plugin + ${maven-toolchains-plugin.version} - compile - compile - - compile - - - - testCompile - test-compile - testCompile + toolchain - ${java.version} - ${java.version} + + + ${jdk-test.version} + + From 5a72a3d88030c620bd31bc7a2c5976a3ffaa1d08 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:19:53 +0400 Subject: [PATCH 068/141] feat(schemas): move Reference and ExtendableObject to schemas package --- .../com/asyncapi/bindings/ChannelBinding.java | 2 +- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../com/asyncapi/bindings/MessageBinding.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../asyncapi/bindings/OperationBinding.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../com/asyncapi/bindings/ServerBinding.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../{ => schemas}/ExtendableObject.java | 2 +- .../com/asyncapi/{ => schemas}/Reference.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../OperationMessageDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- .../com/asyncapi/v2/_0_0/model/AsyncAPI.java | 2 +- .../v2/_0_0/model/ExternalDocumentation.java | 2 +- .../java/com/asyncapi/v2/_0_0/model/Tag.java | 2 +- .../v2/_0_0/model/channel/ChannelItem.java | 4 +- .../v2/_0_0/model/channel/Parameter.java | 2 +- .../model/channel/message/CorrelationId.java | 2 +- .../_0_0/model/channel/message/Message.java | 4 +- .../model/channel/message/MessageTrait.java | 4 +- .../model/channel/operation/Operation.java | 4 +- .../channel/operation/OperationTrait.java | 2 +- .../v2/_0_0/model/component/Components.java | 4 +- .../asyncapi/v2/_0_0/model/info/Contact.java | 2 +- .../com/asyncapi/v2/_0_0/model/info/Info.java | 2 +- .../asyncapi/v2/_0_0/model/info/License.java | 2 +- .../asyncapi/v2/_0_0/model/server/Server.java | 2 +- .../v2/_0_0/model/server/ServerVariable.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../channel/message/MessagesDeserializer.java | 2 +- .../OperationMessageDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../ComponentsCorrelationIdsDeserializer.java | 2 +- .../ComponentsMessageTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- ...ComponentsOperationTraitsDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- ...ComponentsServerVariablesDeserializer.java | 2 +- .../ComponentsServersDeserializer.java | 2 +- .../model/schema/SchemaDeserializer.java | 2 +- .../server/ServerVariablesDeserializer.java | 2 +- .../model/server/ServersDeserializer.java | 2 +- .../com/asyncapi/v2/_6_0/model/AsyncAPI.java | 5 +- .../v2/_6_0/model/ExternalDocumentation.java | 2 +- .../java/com/asyncapi/v2/_6_0/model/Tag.java | 2 +- .../v2/_6_0/model/channel/ChannelItem.java | 7 +- .../v2/_6_0/model/channel/Parameter.java | 5 +- .../model/channel/message/CorrelationId.java | 2 +- .../_6_0/model/channel/message/Message.java | 11 +- .../model/channel/message/MessageExample.java | 2 +- .../model/channel/message/MessageTrait.java | 9 +- .../model/channel/message/OneOfMessages.java | 3 +- .../model/channel/operation/Operation.java | 9 +- .../channel/operation/OperationTrait.java | 5 +- .../v2/_6_0/model/component/Components.java | 29 +++-- .../asyncapi/v2/_6_0/model/info/Contact.java | 2 +- .../com/asyncapi/v2/_6_0/model/info/Info.java | 2 +- .../asyncapi/v2/_6_0/model/info/License.java | 2 +- .../asyncapi/v2/_6_0/model/server/Server.java | 7 +- .../v2/_6_0/model/server/ServerVariable.java | 2 +- .../java/com/asyncapi/v2/schema/Schema.java | 2 +- .../v2/security_scheme/SecurityScheme.java | 2 +- .../v2/security_scheme/oauth2/OAuthFlows.java | 2 +- .../flow/ClientCredentialsOAuthFlow.java | 3 +- .../oauth2/flow/ImplicitOAuthFlow.java | 3 +- .../oauth2/flow/OAuthFlow.java | 2 +- .../oauth2/flow/PasswordOAuthFlow.java | 3 +- .../ExternalDocumentationDeserializer.java | 2 +- .../_0_0/jackson/model/TagsDeserializer.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../model/channel/ChannelsDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessagePayloadDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../channel/message/MessagesDeserializer.java | 2 +- .../ComponentsChannelsDeserializer.java | 2 +- .../ComponentsCorrelationIdsDeserializer.java | 2 +- .../ComponentsExternalDocsDeserializer.java | 2 +- .../ComponentsMessageTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- ...ComponentsOperationTraitsDeserializer.java | 2 +- .../ComponentsOperationsDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsRepliesDeserializer.java | 2 +- .../ComponentsReplyAddressesDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- ...ComponentsServerVariablesDeserializer.java | 2 +- .../ComponentsServersDeserializer.java | 2 +- .../component/ComponentsTagsDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../operation/OperationsDeserializer.java | 2 +- .../OperationReplyAddressDeserializer.java | 2 +- .../reply/OperationReplyDeserializer.java | 2 +- .../server/ServerVariablesDeserializer.java | 2 +- .../model/server/ServersDeserializer.java | 2 +- .../com/asyncapi/v3/_0_0/model/AsyncAPI.java | 4 +- .../v3/_0_0/model/ExternalDocumentation.java | 2 +- .../java/com/asyncapi/v3/_0_0/model/Tag.java | 4 +- .../v3/_0_0/model/channel/Channel.java | 4 +- .../v3/_0_0/model/channel/Parameter.java | 2 +- .../model/channel/message/CorrelationId.java | 2 +- .../_0_0/model/channel/message/Message.java | 4 +- .../model/channel/message/MessageExample.java | 2 +- .../model/channel/message/MessageTrait.java | 4 +- .../v3/_0_0/model/component/Components.java | 4 +- .../asyncapi/v3/_0_0/model/info/Contact.java | 2 +- .../com/asyncapi/v3/_0_0/model/info/Info.java | 4 +- .../asyncapi/v3/_0_0/model/info/License.java | 2 +- .../v3/_0_0/model/operation/Operation.java | 4 +- .../_0_0/model/operation/OperationTrait.java | 4 +- .../model/operation/reply/OperationReply.java | 4 +- .../reply/OperationReplyAddress.java | 2 +- .../asyncapi/v3/_0_0/model/server/Server.java | 4 +- .../v3/_0_0/model/server/ServerVariable.java | 2 +- .../SecuritySchemesDeserializer.java | 2 +- .../asyncapi/v3/schema/AsyncAPISchema.java | 2 +- .../_9_0/jackson/AvroSchemaDeserializer.java | 2 +- .../schema/multiformat/AvroFormatSchema.java | 2 +- .../schema/multiformat/MultiFormatSchema.java | 4 +- .../v3/security_scheme/SecurityScheme.java | 2 +- .../v3/security_scheme/oauth2/OAuthFlows.java | 2 +- .../flow/AuthorizationCodeOAuthFlow.java | 3 +- .../flow/ClientCredentialsOAuthFlow.java | 3 +- .../oauth2/flow/ImplicitOAuthFlow.java | 3 +- .../oauth2/flow/OAuthFlow.java | 2 +- .../oauth2/flow/PasswordOAuthFlow.java | 3 +- .../com/asyncapi/bindings/BindingTest.java | 2 +- .../com/asyncapi/examples/v2/_0_0/AnyOf.kt | 2 +- .../examples/v2/_0_0/ApplicationHeaders.kt | 6 +- .../examples/v2/_0_0/CorrelationId.kt | 10 +- .../examples/v2/_0_0/GitterStreaming.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/Mercure.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/Not.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/OneOf.kt | 2 +- .../examples/v2/_0_0/OperationSecurity.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/Simple.kt | 2 +- .../com/asyncapi/examples/v2/_0_0/SlackRtm.kt | 2 +- .../examples/v2/_0_0/StreetlightsKafka.kt | 19 ++- .../examples/v2/_0_0/StreetlightsMQTT.kt | 19 ++- .../v2/_0_0/StreetlightsOperationSecurity.kt | 19 ++- .../examples/v2/_0_0/WebsocketGemini.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/AnyOf.kt | 2 +- .../examples/v2/_6_0/ApplicationHeaders.kt | 6 +- .../examples/v2/_6_0/CorrelationId.kt | 10 +- .../examples/v2/_6_0/GitterStreaming.kt | 14 +- .../com/asyncapi/examples/v2/_6_0/Mercure.kt | 4 +- .../com/asyncapi/examples/v2/_6_0/Not.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/OneOf.kt | 2 +- .../examples/v2/_6_0/OperationSecurity.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/Simple.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/SlackRtm.kt | 94 +++++++------- .../examples/v2/_6_0/StreetlightsKafka.kt | 18 ++- .../examples/v2/_6_0/StreetlightsMQTT.kt | 18 ++- .../v2/_6_0/StreetlightsOperationSecurity.kt | 19 ++- .../examples/v2/_6_0/WebsocketGemini.kt | 2 +- .../v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt | 6 +- .../examples/v3/_0_0/AnyOfAsyncAPI.kt | 2 +- .../v3/_0_0/ApplicationHeadersAsyncAPI.kt | 2 +- .../examples/v3/_0_0/CorrelationIdAsyncAPI.kt | 2 +- .../v3/_0_0/GitterStreamingAsyncAPI.kt | 2 +- ...equestReplyMessageFilterInReplyAsyncAPI.kt | 2 +- ...ketRequestReplyMultipleChannelsAsyncAPI.kt | 2 +- .../examples/v3/_0_0/MercureAsyncAPI.kt | 2 +- .../asyncapi/examples/v3/_0_0/NotAsyncAPI.kt | 2 +- .../examples/v3/_0_0/OneOfAsyncAPI.kt | 2 +- .../v3/_0_0/OperationSecurityAsyncAPI.kt | 6 +- .../examples/v3/_0_0/RpcClientAsyncAPI.kt | 2 +- .../examples/v3/_0_0/RpcServerAsyncAPI.kt | 2 +- .../examples/v3/_0_0/SimpleAsyncAPI.kt | 2 +- .../examples/v3/_0_0/SlackRtmAsyncAPI.kt | 2 +- .../v3/_0_0/StreetlightsKafkaAsyncAPI.kt | 2 +- .../v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 2 +- .../StreetlightsOperationSecurityAsyncAPI.kt | 2 +- .../v3/_0_0/WebsocketGeminiAsyncAPI.kt | 2 +- .../test/kotlin/com/asyncapi/v2/SerDeTest.kt | 2 +- .../asyncapi/v2/_0_0/model/ReferenceTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 6 +- .../v2/_0_0/model/component/ComponentsTest.kt | 42 ++++-- .../asyncapi/v2/_6_0/model/AsyncAPITest.kt | 6 +- .../asyncapi/v2/_6_0/model/ReferenceTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 26 +++- .../v2/_6_0/model/channel/ParameterTest.kt | 2 +- .../_6_0/model/channel/message/MessageTest.kt | 32 +++-- .../model/channel/message/MessageTraitTest.kt | 46 +++++-- .../channel/message/OneOfMessagesTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 46 +++++-- .../channel/operation/OperationTraitTest.kt | 54 ++++++-- .../v2/_6_0/model/component/ComponentsTest.kt | 62 ++++++--- .../v2/_6_0/model/server/ServerTest.kt | 6 +- .../test/kotlin/com/asyncapi/v3/SerDeTest.kt | 2 +- .../asyncapi/v3/_0_0/model/AsyncAPITest.kt | 10 +- .../asyncapi/v3/_0_0/model/ReferenceTest.kt | 2 +- .../com/asyncapi/v3/_0_0/model/TagTest.kt | 2 +- .../v3/_0_0/model/channel/ChannelTest.kt | 50 +++++-- .../_0_0/model/channel/message/MessageTest.kt | 110 ++++++++++++---- .../model/channel/message/MessageTraitTest.kt | 122 +++++++++++++----- .../v3/_0_0/model/component/ComponentsTest.kt | 26 +++- .../asyncapi/v3/_0_0/model/info/InfoTest.kt | 2 +- .../v3/_0_0/model/operation/OperationTest.kt | 66 +++++++--- .../model/operation/OperationTraitTest.kt | 74 ++++++++--- .../operation/reply/OperationReplyTest.kt | 2 +- .../v3/_0_0/model/server/ServerTest.kt | 2 +- 218 files changed, 992 insertions(+), 547 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{ => schemas}/ExtendableObject.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{ => schemas}/Reference.java (98%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java index fa6934a1..ff6586d0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index 05f35de4..e96a3f0f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.bindings.sqs.SQSChannelBinding; import com.asyncapi.bindings.stomp.STOMPChannelBinding; import com.asyncapi.bindings.websockets.WebSocketsChannelBinding; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java index ecd159f3..84b178f8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 3c03744b..52be2cff 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.bindings.sqs.SQSMessageBinding; import com.asyncapi.bindings.stomp.STOMPMessageBinding; import com.asyncapi.bindings.websockets.WebSocketsMessageBinding; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java index efde44df..560b2f4e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index 995e3272..f6bd8938 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.bindings.sqs.SQSOperationBinding; import com.asyncapi.bindings.stomp.STOMPOperationBinding; import com.asyncapi.bindings.websockets.WebSocketsOperationBinding; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java index b0ea9840..f6c2fd4d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 8ee2a09a..e96de0de 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.bindings.sqs.SQSServerBinding; import com.asyncapi.bindings.stomp.STOMPServerBinding; import com.asyncapi.bindings.websockets.WebSocketsServerBinding; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/ExtendableObject.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/ExtendableObject.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java index fc1555c5..e41657c8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/ExtendableObject.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java @@ -1,4 +1,4 @@ -package com.asyncapi; +package com.asyncapi.schemas; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/asyncapi-core/src/main/java/com/asyncapi/Reference.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/Reference.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/Reference.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/Reference.java index 6ceb9241..e7c30ec6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/Reference.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/Reference.java @@ -1,4 +1,4 @@ -package com.asyncapi; +package com.asyncapi.schemas; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java index 89c3cba4..7ff5b865 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index 66df0b3c..fe27cf19 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.channel.message.CorrelationId; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index d790aa00..27c6e0ec 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java index 225de3b0..5e906add 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java index 387975fd..137987cb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.operation; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java index 7a6ebe60..b25cf469 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.operation; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java index f0abd1f4..345e9b62 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java index fe984f4d..88595306 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index 44694440..17cca36a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index e837e0b2..f383674d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; import com.asyncapi.v2.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java index df3231a6..517f37de 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2._0_0.model.channel.ChannelItem; import com.asyncapi.v2._0_0.model.component.Components; import com.asyncapi.v2._0_0.model.info.Info; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java index 5e3ce1dc..72859f85 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java index 8c51efeb..1205521c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java index 5b5376ac..08a1b5ff 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java @@ -1,8 +1,8 @@ package com.asyncapi.v2._0_0.model.channel; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.ChannelParametersDeserializer; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.channel.operation.Operation; import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.ChannelBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java index 99707c4f..c6010dc5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2.schema.Schema; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java index 04ab445f..341e090f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel.message; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java index 16375f26..cc339faa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java @@ -1,12 +1,12 @@ package com.asyncapi.v2._0_0.model.channel.message; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessagePayloadDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageTraitsDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2.schema.Schema; import com.asyncapi.bindings.MessageBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java index 5430ee24..6f65e1fb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java @@ -1,10 +1,10 @@ package com.asyncapi.v2._0_0.model.channel.message; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.schema.Schema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java index 74045860..79f3f4a0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java @@ -1,10 +1,10 @@ package com.asyncapi.v2._0_0.model.channel.operation; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationMessageDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationTraitsDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.bindings.OperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java index 1ec0ee80..45263475 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel.operation; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2._0_0.model.ExternalDocumentation; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java index 3d8504b3..2fe4593a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java @@ -1,11 +1,11 @@ package com.asyncapi.v2._0_0.model.component; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsMessagesDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsParametersDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsSchemasDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsSecuritySchemesDeserializer; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; import com.asyncapi.v2._0_0.model.channel.message.CorrelationId; import com.asyncapi.v2._0_0.model.channel.message.Message; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java index 7e5912f3..07a3f270 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.info; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java index 560b41e9..27e01fbb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.info; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java index a11085be..066a0398 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.info; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java index 5628df92..acd0ef94 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.server; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.bindings.ServerBinding; import com.asyncapi.bindings.ServerBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java index 4e54612b..88a059d6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.server; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java index 97d89c17..618f6aa9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index bd1e36bd..1ea3cf91 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.message.CorrelationId; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 1e71daa3..04178d4c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java index 2ba422f3..9e0c350b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.message.MessageTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java index 0133c93f..0dc5ebc4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java index b8a8fa08..a7808368 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.operation; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java index 428468ea..0af89c06 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.operation; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java index 57318d08..efa498fe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.message.CorrelationId; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java index 9b782ba8..0e0d4730 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.message.MessageTrait; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java index fb569307..3ba7b850 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java index ee5fccb2..261a1560 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java index 9f601a6d..4d57c0e2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java index a66c2df8..ed17d558 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index 0957e7f2..f97d14e1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; import com.asyncapi.v2.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java index 265d1cdf..83e48ddf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.server.ServerVariable; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java index 07fde4a2..6f6115d6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.server.Server; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java index 6cc5654d..5d0d24e6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.schema; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2.schema.Schema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java index ee6f0131..e8c48a15 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.server; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.server.ServerVariable; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java index 51b0a8b0..f3d2d4c0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.server; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.server.Server; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java index 863d6809..34a04f44 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java @@ -1,6 +1,7 @@ package com.asyncapi.v2._6_0.model; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.jackson.model.server.ServersDeserializer; import com.asyncapi.v2._6_0.model.channel.ChannelItem; import com.asyncapi.v2._6_0.model.component.Components; @@ -76,7 +77,7 @@ public class AsyncAPI extends ExtendableObject { * MUST BE: *
    *
  • {@link Server}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java index 609c28f4..2cb20f77 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java index a9c32846..b2046f77 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java index 39a7a17a..998b43c9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java @@ -1,6 +1,7 @@ package com.asyncapi.v2._6_0.model.channel; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.jackson.model.channel.ChannelParametersDeserializer; import com.asyncapi.v2._6_0.model.channel.operation.Operation; import com.asyncapi.bindings.ChannelBinding; @@ -73,7 +74,7 @@ public class ChannelItem extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.Parameter}
    • *
*/ @@ -86,7 +87,7 @@ public class ChannelItem extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link ChannelBinding}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java index adbe82c0..d71e7e29 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java @@ -1,6 +1,7 @@ package com.asyncapi.v2._6_0.model.channel; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.jackson.model.schema.SchemaDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; @@ -35,7 +36,7 @@ public class Parameter extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2.schema.Schema}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java index 48af83a1..c5ab0643 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java index 4358f777..8af4209b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java @@ -1,6 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessagePayloadDeserializer; @@ -51,7 +52,7 @@ public class Message extends ExtendableObject { * MUST BE: *
    *
  • {@link com.asyncapi.v2.schema.Schema}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable @@ -78,7 +79,7 @@ public class Message extends ExtendableObject { * MUST BE: *
    *
  • {@link com.asyncapi.v2._6_0.model.channel.message.CorrelationId}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable @@ -149,7 +150,7 @@ public class Message extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link MessageBinding}
    • *
*/ @@ -170,7 +171,7 @@ public class Message extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.message.MessageTrait}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java index db267857..296a43fe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java index df479f84..e32670b8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java @@ -1,6 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; @@ -55,7 +56,7 @@ public class MessageTrait extends ExtendableObject { * MUST BE: *
    *
  • {@link com.asyncapi.v2.schema.Schema}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable @@ -68,7 +69,7 @@ public class MessageTrait extends ExtendableObject { * MUST BE: *
    *
  • {@link com.asyncapi.v2._6_0.model.channel.message.CorrelationId}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable @@ -139,7 +140,7 @@ public class MessageTrait extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link MessageBinding}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java index 71e7fdd9..6f2e46a8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java @@ -1,5 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessagesDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; @@ -26,7 +27,7 @@ public class OneOfMessages { * Given message MUST be one of provided messages. * *
    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.message.Message}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java index 92156883..8a09e510 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java @@ -1,6 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.operation; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.jackson.model.channel.operation.OperationMessageDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.operation.OperationTraitsDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; @@ -87,7 +88,7 @@ public class Operation extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link OperationBinding}
    • *
*/ @@ -101,7 +102,7 @@ public class Operation extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.operation.OperationTrait}
    • *
*/ @@ -116,7 +117,7 @@ public class Operation extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.message.Message}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.message.OneOfMessages}
    • *
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java index 60625035..c574a829 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java @@ -1,6 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.operation; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.bindings.OperationBinding; @@ -92,7 +93,7 @@ public class OperationTrait extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link OperationBinding}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index f1a1356e..6eb54a37 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -1,6 +1,7 @@ package com.asyncapi.v2._6_0.model.component; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsCorrelationIdsDeserializer; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsMessageTraitsDeserializer; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsMessagesDeserializer; @@ -52,7 +53,7 @@ public class Components extends ExtendableObject { * MUST BE: *
    *
  • {@link com.asyncapi.v2.schema.Schema}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable @@ -65,7 +66,7 @@ public class Components extends ExtendableObject { * MUST BE: *
    *
  • {@link com.asyncapi.v2._6_0.model.server.Server}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable @@ -78,7 +79,7 @@ public class Components extends ExtendableObject { * MUST BE: *
    *
  • {@link com.asyncapi.v2._6_0.model.server.ServerVariable}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable @@ -96,7 +97,7 @@ public class Components extends ExtendableObject { * MUST BE: *
    *
  • {@link com.asyncapi.v2._6_0.model.channel.message.Message}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable @@ -109,7 +110,7 @@ public class Components extends ExtendableObject { * MUST BE: *
    *
  • {@link SecurityScheme}
    • - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
*/ @Nullable @@ -121,7 +122,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.Parameter}
    • *
*/ @@ -134,7 +135,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.message.CorrelationId}
    • *
*/ @@ -147,7 +148,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.operation.OperationTrait}
    • *
*/ @@ -160,7 +161,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.channel.message.MessageTrait}
    • *
*/ @@ -172,7 +173,7 @@ public class Components extends ExtendableObject { * An object to hold reusable {@link ServerBinding} Objects. * MUST BE: *
    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link ServerBinding}
    • *
*/ @@ -184,7 +185,7 @@ public class Components extends ExtendableObject { * An object to hold reusable {@link ChannelBinding} Objects. * MUST BE: *
    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link ChannelBinding}
    • *
*/ @@ -196,7 +197,7 @@ public class Components extends ExtendableObject { * An object to hold reusable {@link OperationBinding} Objects. * MUST BE: *
    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link OperationBinding}
    • *
*/ @@ -208,7 +209,7 @@ public class Components extends ExtendableObject { * An object to hold reusable {@link MessageBinding} Objects. * MUST BE: *
    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link MessageBinding}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java index 9279795b..cb035bfb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.info; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java index 585235e2..b73414ab 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.info; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java index ad0f1b44..3f942e8d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.info; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java index bb0256a4..11fcacc6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java @@ -1,6 +1,7 @@ package com.asyncapi.v2._6_0.model.server; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v2._6_0.jackson.model.server.ServerVariablesDeserializer; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.bindings.ServerBinding; @@ -73,7 +74,7 @@ public class Server extends ExtendableObject { *

* MUST be one of: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link com.asyncapi.v2._6_0.model.server.ServerVariable}
    • *
*/ @@ -107,7 +108,7 @@ public class Server extends ExtendableObject { *

* MUST be one of: *

    - *
  • {@link com.asyncapi.Reference}
    • + *
  • {@link Reference}
    • *
  • {@link ServerBinding}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java index e59e72a8..27a2dc54 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.server; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java b/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java index 9028b4bc..f7acdb78 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.schema; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.schema.SchemasAdditionalPropertiesDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; import com.asyncapi.v2.jackson.SchemaItemsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java index c9035d15..6f5e552c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.security_scheme; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2.security_scheme.http.HttpApiKeySecurityScheme; import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme; import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java index 08b7846d..66a281c0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.security_scheme.oauth2; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v2.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow; import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow; import com.asyncapi.v2.security_scheme.oauth2.flow.ImplicitOAuthFlow; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java index 0d538bf3..bd202d98 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -1,5 +1,6 @@ package com.asyncapi.v2.security_scheme.oauth2.flow; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,7 +14,7 @@ /** * Configuration for the OAuth Client Credentials flow *

- * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * This object MAY be extended with {@link ExtendableObject}. * * @version 2.6.0 * @see OAuth Flow Object diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java index 4d88aa52..8dd05924 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java @@ -1,5 +1,6 @@ package com.asyncapi.v2.security_scheme.oauth2.flow; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,7 +14,7 @@ /** * Configuration for the OAuth Implicit flow *

- * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * This object MAY be extended with {@link ExtendableObject}. * * @version 2.6.0 * @see OAuth Flow Object diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java index d1953f5c..d6f65ca8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.security_scheme.oauth2.flow; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java index 54345b50..0499fa1a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java @@ -1,5 +1,6 @@ package com.asyncapi.v2.security_scheme.oauth2.flow; +import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,7 +14,7 @@ /** * Configuration for the OAuth Resource Owner Protected Credentials flow *

- * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * This object MAY be extended with {@link ExtendableObject}. * * @version 2.6.0 * @see OAuth Flow Object diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java index ca95dcd8..7ef73764 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java index f8fc199d..62635cef 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java index f5e180b7..7746101c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.Parameter; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java index 820d3808..d2f271e7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.Channel; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index 987774b0..6eb7366b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.message.CorrelationId; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index a6328ed9..7e8ac883 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java index fca783fd..0cef09a5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java index bb8dcf5a..e7e44b8d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.message.MessageTrait; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java index ad1ac286..a4b31028 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.message.Message; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java index 3ec96a39..32bfa332 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.Channel; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java index 9e651f65..b6ea8890 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.message.CorrelationId; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java index cfb41d49..f17edc60 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java index d77bb440..257501eb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.message.MessageTrait; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java index 5a54b6c1..5b1ab9b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.message.Message; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java index a698e3bd..8fff8798 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.operation.OperationTrait; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java index 9ccf9a80..284444f9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.operation.Operation; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java index 16141f99..6e28a9ac 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.channel.Parameter; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java index d0212157..8799fc34 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java index 1a99edb8..30f62875 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index d2bb9c59..01491e41 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index 07cd67ce..56e75020 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; import com.asyncapi.v3.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java index 8cd73e30..3009a7b5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.server.ServerVariable; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java index 125ec1a8..835eb49c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.server.Server; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java index 09e8ed6f..092488f9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java index 288e8965..3ee3e3af 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.operation.OperationTrait; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java index 979761f1..39639b7e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.operation.Operation; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java index 841acfa8..24137817 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation.reply; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java index 3d1ee162..07fcc46f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation.reply; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java index 96272a67..75c71084 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.server; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.server.ServerVariable; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java index ab5d2287..39caca7f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.server; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.server.Server; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java index 584bc17b..1d083f3f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.channel.ChannelsDeserializer; import com.asyncapi.v3._0_0.jackson.model.operation.OperationsDeserializer; import com.asyncapi.v3._0_0.jackson.model.server.ServersDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java index 302f6d13..fa44665d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java index 565223cd..963cbf3a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java index 3114a787..bcaebc7e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.channel; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessagesDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java index fa662d13..48f55ab9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java index 807575ce..fe733262 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java index a690737c..41539cf8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java index 9d068dd4..c23e20a2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java index 3a4ecbce..d16dcf5e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index 06c13cfe..14f94811 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.component; import com.asyncapi.v3._0_0.jackson.model.component.*; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3._0_0.model.channel.Channel; @@ -26,7 +26,7 @@ import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.v3.security_scheme.SecurityScheme; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java index 8781e461..eb1f171d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java index 18b6e5b9..99b9f239 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java @@ -1,11 +1,11 @@ package com.asyncapi.v3._0_0.model.info; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java index bd9faeca..02cc6252 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java index 0c3ef9b4..44bb5e3a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.operation.OperationTraitsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java index 4b5c9aac..c0a27bc3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java index 8c42cf55..3dc979ea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation.reply; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.operation.reply.OperationReplyAddressDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java index 342ec12b..c001d846 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation.reply; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java index 96720c53..2c36ceaa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java @@ -3,8 +3,8 @@ import com.asyncapi.bindings.ServerBindingsDeserializer; import com.asyncapi.v3._0_0.jackson.model.server.ServerVariablesDeserializer; import com.asyncapi.bindings.ServerBinding; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java index b41906c3..c49951b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.server; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java index dfb85311..2ab2ee4a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.jackson.security_scheme; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; import com.asyncapi.v3.security_scheme.SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java index 259a7813..ff436c7c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAdditionalPropertiesDeserializer; import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAnyValueDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java index 8f48e69b..5e916b19 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.avro.v1._9_0.jackson; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchema; import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaUnion; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java index 5841e172..db9244ea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat; -import com.asyncapi.Reference; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3.schema.AsyncAPISchema; import com.asyncapi.v3.schema.avro.v1._9_0.jackson.AvroSchemaDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java index 801f9c2b..a136fab4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat; -import com.asyncapi.ExtendableObject; -import com.asyncapi.Reference; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.Reference; import com.asyncapi.v3.schema.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java index 706f2289..faf4614d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.security_scheme; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v3.security_scheme.http.HttpApiKeySecurityScheme; import com.asyncapi.v3.security_scheme.http.HttpSecurityScheme; import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java index fbb41f7e..e2bf0db2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v3.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow; import com.asyncapi.v3.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow; import com.asyncapi.v3.security_scheme.oauth2.flow.ImplicitOAuthFlow; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java index c9bb1d6a..d16786b8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -9,7 +10,7 @@ /** * Configuration for the OAuth Authorization Code flow *

- * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * This object MAY be extended with {@link ExtendableObject}. * * @see OAuth Flow * @see Specification Extensions diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java index 660138e0..5995a99a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -9,7 +10,7 @@ /** * Configuration for the OAuth Client Credentials flow *

- * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * This object MAY be extended with {@link ExtendableObject}. * * @see OAuth Flow * @see Specification Extensions diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java index dc32c38c..dd7a4348 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -9,7 +10,7 @@ /** * Configuration for the OAuth Implicit flow *

- * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * This object MAY be extended with {@link ExtendableObject}. * * @see OAuth Flow * @see Specification Extensions diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java index 1f63c1bb..7d975634 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java index 838ef794..979c9297 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow; +import com.asyncapi.schemas.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -9,7 +10,7 @@ /** * Configuration for the OAuth Resource Owner Protected Credentials flow *

- * This object MAY be extended with {@link com.asyncapi.ExtendableObject}. + * This object MAY be extended with {@link ExtendableObject}. * * @see OAuth Flow * @see Specification Extensions diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java index 47d4b273..072a8c30 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.ExtendableObject; +import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt index 7a12484d..ad9d8750 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt index 4a6b03f7..ef393d1d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.CorrelationId @@ -55,7 +55,9 @@ class ApplicationHeaders: AbstractExampleValidationTest() { return mapOf( Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .publish(Operation.builder() .summary("Inform about environmental lighting conditions of a particular streetlight.") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt index b51ba526..80953619 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.CorrelationId @@ -70,7 +70,9 @@ class CorrelationId: AbstractExampleValidationTest() { return mapOf( Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .publish(Operation.builder() .summary("Inform about environmental lighting conditions of a particular streetlight.") @@ -82,7 +84,9 @@ class CorrelationId: AbstractExampleValidationTest() { ), Pair("smartylighting/streetlights/1/0/action/{streetlightId}/dim", ChannelItem.builder() .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .subscribe(Operation.builder() .operationId("dimLight") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt index fdcfc573..85de783e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt index 17ef936a..4af6ad33 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt index e50392e9..d66436a3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt index c93fe2dd..7f1fc44d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt index 0787de9b..83da8052 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod import com.asyncapi.v2._0_0.model.channel.ChannelItem diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt index d5345f33..11ffe9ea 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt index 80f868f7..62218061 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt index 5140ebeb..02f516b3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt @@ -1,7 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference -import com.asyncapi.v2._0_0.model.Tag +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message @@ -67,7 +66,9 @@ class StreetlightsKafka: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.event.{streetlightId}.lighting.measured", ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") .summary("Inform about environmental lighting conditions of a particular streetlight.") @@ -78,7 +79,9 @@ class StreetlightsKafka: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOn") .traits(listOf(Reference("#/components/operationTraits/kafka"))) @@ -88,7 +91,9 @@ class StreetlightsKafka: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOff") .traits(listOf(Reference("#/components/operationTraits/kafka"))) @@ -98,7 +103,9 @@ class StreetlightsKafka: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.dim", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("dimLight") .traits(listOf(Reference("#/components/operationTraits/kafka"))) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt index 877ce684..4ef375ec 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt @@ -1,7 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference -import com.asyncapi.v2._0_0.model.Tag +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message @@ -81,7 +80,9 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") .summary("Inform about environmental lighting conditions of a particular streetlight.") @@ -92,7 +93,9 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ), Pair("smartylighting/streetlights/1/0/action/{streetlightId}/turn/on", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOn") .traits(listOf(Reference("#/components/operationTraits/mqtt"))) @@ -102,7 +105,9 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ), Pair("smartylighting/streetlights/1/0/action/{streetlightId}/turn/off", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOff") .traits(listOf(Reference("#/components/operationTraits/mqtt"))) @@ -112,7 +117,9 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ), Pair("smartylighting/streetlights/1/0/action/{streetlightId}/dim", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("dimLight") .traits(listOf(Reference("#/components/operationTraits/mqtt"))) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt index 4d00e127..11ee7fa4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt @@ -1,7 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference -import com.asyncapi.v2._0_0.model.Tag +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message @@ -73,7 +72,9 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.event.{streetlightId}.lighting.measured", ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") .summary("Inform about environmental lighting conditions of a particular streetlight.") @@ -84,7 +85,9 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOn") .traits(listOf(Reference("#/components/operationTraits/kafka"))) @@ -94,7 +97,9 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOff") .traits(listOf(Reference("#/components/operationTraits/kafka"))) @@ -105,7 +110,9 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.dim", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("dimLight") .traits(listOf(Reference("#/components/operationTraits/kafka"))) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt index 2a88b81a..26138b76 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt index 399b6f34..3afe3155 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt index 7909b9ed..c12a4078 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.CorrelationId @@ -55,7 +55,9 @@ class ApplicationHeaders: AbstractExampleValidationTest() { return mapOf( Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .publish(Operation.builder() .summary("Inform about environmental lighting conditions of a particular streetlight.") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt index 6799ec79..dda4e41e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.CorrelationId @@ -70,7 +70,9 @@ class CorrelationId: AbstractExampleValidationTest() { return mapOf( Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .publish(Operation.builder() .summary("Inform about environmental lighting conditions of a particular streetlight.") @@ -82,7 +84,9 @@ class CorrelationId: AbstractExampleValidationTest() { ), Pair("smartylighting/streetlights/1/0/action/{streetlightId}/dim", ChannelItem.builder() .parameters(mapOf( - Pair("streetlightId", Reference("#/components/parameters/streetlightId")) + Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ) )) .subscribe(Operation.builder() .operationId("dimLight") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt index a3d37279..7725bf89 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.Message @@ -72,8 +72,8 @@ class GitterStreaming: AbstractExampleValidationTest() { ) )) .message(OneOfMessages(listOf( - Reference("#/components/messages/chatMessage"), - Reference("#/components/messages/heartbeat") + Reference("#/components/messages/chatMessage"), + Reference("#/components/messages/heartbeat") ))) .build() ) @@ -249,7 +249,9 @@ class GitterStreaming: AbstractExampleValidationTest() { .build() ) .bindings(mapOf( - Pair("http", Reference("#/components/messageBindings/streamingHeaders")) + Pair("http", + Reference("#/components/messageBindings/streamingHeaders") + ) )) .build() ), @@ -262,7 +264,9 @@ class GitterStreaming: AbstractExampleValidationTest() { .build() ) .bindings(mapOf( - Pair("http", Reference("#/components/messageBindings/streamingHeaders")) + Pair("http", + Reference("#/components/messageBindings/streamingHeaders") + ) )) .build() ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt index 73b37b6b..941158eb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt @@ -1,17 +1,15 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.Message -import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme class Mercure: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt index 443cfefb..6af8cccc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt index dbc938d0..8c6df567 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt index 5470dd5b..85e1abff 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt index c1994011..da69e351 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt index b3fd1acc..c1ee8b78 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages @@ -49,52 +49,52 @@ class SlackRtm: AbstractExampleValidationTest() { ) .subscribe(Operation.builder() .message(OneOfMessages(listOf( - Reference("#/components/messages/hello"), - Reference("#/components/messages/connectionError"), - Reference("#/components/messages/accountsChanged"), - Reference("#/components/messages/botAdded"), - Reference("#/components/messages/botChanged"), - Reference("#/components/messages/channelArchive"), - Reference("#/components/messages/channelCreated"), - Reference("#/components/messages/channelDeleted"), - Reference("#/components/messages/channelHistoryChanged"), - Reference("#/components/messages/channelJoined"), - Reference("#/components/messages/channelLeft"), - Reference("#/components/messages/channelMarked"), - Reference("#/components/messages/channelRename"), - Reference("#/components/messages/channelUnarchive"), - Reference("#/components/messages/commandsChanged"), - Reference("#/components/messages/dndUpdated"), - Reference("#/components/messages/dndUpdatedUser"), - Reference("#/components/messages/emailDomainChanged"), - Reference("#/components/messages/emojiRemoved"), - Reference("#/components/messages/emojiAdded"), - Reference("#/components/messages/fileChange"), - Reference("#/components/messages/fileCommentAdded"), - Reference("#/components/messages/fileCommentDeleted"), - Reference("#/components/messages/fileCommentEdited"), - Reference("#/components/messages/fileCreated"), - Reference("#/components/messages/fileDeleted"), - Reference("#/components/messages/filePublic"), - Reference("#/components/messages/fileShared"), - Reference("#/components/messages/fileUnshared"), - Reference("#/components/messages/goodbye"), - Reference("#/components/messages/groupArchive"), - Reference("#/components/messages/groupClose"), - Reference("#/components/messages/groupHistoryChanged"), - Reference("#/components/messages/groupJoined"), - Reference("#/components/messages/groupLeft"), - Reference("#/components/messages/groupMarked"), - Reference("#/components/messages/groupOpen"), - Reference("#/components/messages/groupRename"), - Reference("#/components/messages/groupUnarchive"), - Reference("#/components/messages/imClose"), - Reference("#/components/messages/imCreated"), - Reference("#/components/messages/imMarked"), - Reference("#/components/messages/imOpen"), - Reference("#/components/messages/manualPresenceChange"), - Reference("#/components/messages/memberJoinedChannel"), - Reference("#/components/messages/message") + Reference("#/components/messages/hello"), + Reference("#/components/messages/connectionError"), + Reference("#/components/messages/accountsChanged"), + Reference("#/components/messages/botAdded"), + Reference("#/components/messages/botChanged"), + Reference("#/components/messages/channelArchive"), + Reference("#/components/messages/channelCreated"), + Reference("#/components/messages/channelDeleted"), + Reference("#/components/messages/channelHistoryChanged"), + Reference("#/components/messages/channelJoined"), + Reference("#/components/messages/channelLeft"), + Reference("#/components/messages/channelMarked"), + Reference("#/components/messages/channelRename"), + Reference("#/components/messages/channelUnarchive"), + Reference("#/components/messages/commandsChanged"), + Reference("#/components/messages/dndUpdated"), + Reference("#/components/messages/dndUpdatedUser"), + Reference("#/components/messages/emailDomainChanged"), + Reference("#/components/messages/emojiRemoved"), + Reference("#/components/messages/emojiAdded"), + Reference("#/components/messages/fileChange"), + Reference("#/components/messages/fileCommentAdded"), + Reference("#/components/messages/fileCommentDeleted"), + Reference("#/components/messages/fileCommentEdited"), + Reference("#/components/messages/fileCreated"), + Reference("#/components/messages/fileDeleted"), + Reference("#/components/messages/filePublic"), + Reference("#/components/messages/fileShared"), + Reference("#/components/messages/fileUnshared"), + Reference("#/components/messages/goodbye"), + Reference("#/components/messages/groupArchive"), + Reference("#/components/messages/groupClose"), + Reference("#/components/messages/groupHistoryChanged"), + Reference("#/components/messages/groupJoined"), + Reference("#/components/messages/groupLeft"), + Reference("#/components/messages/groupMarked"), + Reference("#/components/messages/groupOpen"), + Reference("#/components/messages/groupRename"), + Reference("#/components/messages/groupUnarchive"), + Reference("#/components/messages/imClose"), + Reference("#/components/messages/imCreated"), + Reference("#/components/messages/imMarked"), + Reference("#/components/messages/imOpen"), + Reference("#/components/messages/manualPresenceChange"), + Reference("#/components/messages/memberJoinedChannel"), + Reference("#/components/messages/message") ))) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt index 957a46c5..fa2682f9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter @@ -95,7 +95,9 @@ class StreetlightsKafka: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.event.{streetlightId}.lighting.measured", ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") .summary("Inform about environmental lighting conditions of a particular streetlight.") @@ -106,7 +108,9 @@ class StreetlightsKafka: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOn") .traits(listOf(Reference("#/components/operationTraits/kafka"))) @@ -116,7 +120,9 @@ class StreetlightsKafka: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOff") .traits(listOf(Reference("#/components/operationTraits/kafka"))) @@ -126,7 +132,9 @@ class StreetlightsKafka: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.dim", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("dimLight") .traits(listOf(Reference("#/components/operationTraits/kafka"))) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt index 88722c42..417d2c96 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter @@ -86,7 +86,9 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") .summary("Inform about environmental lighting conditions of a particular streetlight.") @@ -97,7 +99,9 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ), Pair("smartylighting/streetlights/1/0/action/{streetlightId}/turn/on", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOn") .traits(listOf(Reference("#/components/operationTraits/mqtt"))) @@ -107,7 +111,9 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ), Pair("smartylighting/streetlights/1/0/action/{streetlightId}/turn/off", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOff") .traits(listOf(Reference("#/components/operationTraits/mqtt"))) @@ -117,7 +123,9 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ), Pair("smartylighting/streetlights/1/0/action/{streetlightId}/dim", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("dimLight") .traits(listOf(Reference("#/components/operationTraits/mqtt"))) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt index ea707b5b..d916296a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt @@ -1,7 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference -import com.asyncapi.v2._6_0.model.Tag +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.Message @@ -73,7 +72,9 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.event.{streetlightId}.lighting.measured", ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") .summary("Inform about environmental lighting conditions of a particular streetlight.") @@ -85,7 +86,9 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOn") .traits(listOf(Reference("#/components/operationTraits/kafka"))) @@ -97,7 +100,9 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("turnOff") .traits(listOf(Reference("#/components/operationTraits/kafka"))) @@ -110,7 +115,9 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ), Pair("smartylighting.streetlights.1.0.action.{streetlightId}.dim", ChannelItem.builder() - .parameters(mapOf(Pair("streetlightId", Reference("#/components/parameters/streetlightId")))) + .parameters(mapOf(Pair("streetlightId", + Reference("#/components/parameters/streetlightId") + ))) .subscribe(Operation.builder() .operationId("dimLight") .traits(listOf(Reference("#/components/operationTraits/kafka"))) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt index 11eaaa8f..08dfb977 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt index 6f224c10..97feab1c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -117,7 +117,9 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { "![](https://user-images.githubusercontent.com/5501911/188920831-689cec5f-8dc3-460b-8794-0b54ec8b0ac8.png)\n" ) .parameters(mapOf( - Pair("env", Reference("#/components/parameters/Env")), + Pair("env", + Reference("#/components/parameters/Env") + ), Pair("version", Reference("#/components/parameters/Version") ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt index 39c0a3d8..df43b504 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt index 067bc981..0b54fb37 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt index f8792f7f..4f5c2f68 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt @@ -1,7 +1,7 @@ package com.asyncapi.examples.v3._0_0 import com.asyncapi.v3.security_scheme.ApiKeySecurityScheme -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index 025518e1..d11af45a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt index 52fafacf..8125cf0b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.CorrelationId import com.asyncapi.v3._0_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt index 42062c6c..2ce02506 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.CorrelationId import com.asyncapi.v3._0_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt index 90c64606..a7ed696f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt index 661e93a4..394c5065 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt index 9161ff86..b2adc39c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt index a000152c..7fa021c7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod import com.asyncapi.v3._0_0.model.channel.Channel @@ -35,7 +35,7 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { .address("AUTHORIZATION_REVOCATION") .messages(mapOf( Pair("message", - Reference("#/components/messages/message") + Reference("#/components/messages/message") ) )) .build() @@ -73,7 +73,7 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { .build()) )) .messages(listOf( - Reference("#/channels/authRevoke/messages/message") + Reference("#/channels/authRevoke/messages/message") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt index 1d0a514a..2a0778bb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt index efc3e077..b192a395 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt index d1539244..2be505db 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt index f56b5f34..60cf27cc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt index ca09113f..fb673986 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index 455ee4f1..7c85e601 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -2,7 +2,7 @@ package com.asyncapi.examples.v3._0_0 import com.asyncapi.v3.security_scheme.ApiKeySecurityScheme import com.asyncapi.v3.security_scheme.OpenIdConnectSecurityScheme -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt index 9cda4029..c5b1c17a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt index 564326c5..96d2d059 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt index 22550860..fbf91baf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2 -import com.asyncapi.ExtendableObject +import com.asyncapi.schemas.ExtendableObject import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.JsonMappingException import com.fasterxml.jackson.databind.ObjectMapper diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt index 05432b01..3a4c9f8a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index d6f39123..e9a4742a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v2._0_0.model.channel.message import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2.schema.Schema import com.asyncapi.bindings.MessageBinding @@ -106,7 +106,7 @@ class MessageTest: SerDeTest() { ) )) .traits(listOf( - Reference("#/components/messageTraits/commonHeaders"), + Reference("#/components/messageTraits/commonHeaders"), )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 8e748365..d4d88513 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v2._0_0.model.channel.operation import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.message.MessageTest import com.asyncapi.bindings.OperationBinding @@ -54,7 +54,7 @@ class OperationWithReferenceToMessageTest: SerDeTest() { .externalDocs(ExternalDocumentation("Messages sending rules", "messages/sending-rules")) .bindings(OperationTest.bindings()) .traits(listOf( - Reference("#/components/operationTraits/sendMessage"), + Reference("#/components/operationTraits/sendMessage"), OperationTraitTest().build() )) .message(Reference("#/components/schemas/sendMessage")) @@ -88,7 +88,7 @@ class OperationWithMessageTest: SerDeTest() { .externalDocs(ExternalDocumentation("Messages sending rules", "messages/sending-rules")) .bindings(OperationTest.bindings()) .traits(listOf( - Reference("#/components/operationTraits/sendMessage"), + Reference("#/components/operationTraits/sendMessage"), OperationTraitTest().build() )) .message(MessageTest().build()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt index e16b65b7..734c4633 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model.component import com.asyncapi.v2.SerDeTest -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItemTest import com.asyncapi.v2._0_0.model.channel.ParameterTest import com.asyncapi.v2._0_0.model.channel.message.CorrelationIdTest @@ -55,27 +55,47 @@ class ComponentsTest: SerDeTest() { )) .messages(mapOf( Pair("userSignup", MessageTest().build()), - Pair("userSignout", Reference("#/components/messages/userSignout")) + Pair("userSignout", + Reference("#/components/messages/userSignout") + ) )) .securitySchemes(mapOf( Pair("apiKey", ApiKeySecuritySchemeTest().build()), - Pair("asymmetricEncryption", Reference("#/components/securitySchemes/asymmetricEncryption")), - Pair("gssapi", Reference("#/components/securitySchemes/gssapi")), + Pair("asymmetricEncryption", + Reference("#/components/securitySchemes/asymmetricEncryption") + ), + Pair("gssapi", + Reference("#/components/securitySchemes/gssapi") + ), Pair("oauth2", OAuth2SecuritySchemeTest().build()), Pair("openIdConnect", OpenIdConnectSecuritySchemeTest().build()), Pair("httpApiKey", HttpApiKeySecuritySchemeTest().build()), Pair("httpBasic", HttpSecuritySchemeBasicTest().build()), Pair("httpBearer", HttpSecuritySchemeBearerTest().build()), - Pair("plain", Reference("#/components/securitySchemes/plain")), - Pair("scramSha256", Reference("#/components/securitySchemes/scramSha256")), - Pair("scramSha512", Reference("#/components/securitySchemes/scramSha512")), - Pair("symmetricEncryption", Reference("#/components/securitySchemes/symmetricEncryption")), - Pair("userPassword", Reference("#/components/securitySchemes/userPassword")), - Pair("X509", Reference("#/components/securitySchemes/X509")), + Pair("plain", + Reference("#/components/securitySchemes/plain") + ), + Pair("scramSha256", + Reference("#/components/securitySchemes/scramSha256") + ), + Pair("scramSha512", + Reference("#/components/securitySchemes/scramSha512") + ), + Pair("symmetricEncryption", + Reference("#/components/securitySchemes/symmetricEncryption") + ), + Pair("userPassword", + Reference("#/components/securitySchemes/userPassword") + ), + Pair("X509", + Reference("#/components/securitySchemes/X509") + ), )) .parameters(mapOf( Pair("parameter", ParameterTest().build()), - Pair("parameterRef", Reference("#/components/parameters/parameter")) + Pair("parameterRef", + Reference("#/components/parameters/parameter") + ) )) .correlationIds(mapOf( Pair("userSignupCorrelationId", CorrelationIdTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt index 0e5368be..32179815 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.channel.ChannelItemTest import com.asyncapi.v2._6_0.model.component.ComponentsTest @@ -27,7 +27,9 @@ class AsyncAPITest: SerDeTest() { InfoTest().build(), mapOf( Pair("stage", ServerTest().build()), - Pair("stage-2", Reference("#/components/servers/stage-2")) + Pair("stage-2", + Reference("#/components/servers/stage-2") + ) ), "application/json", mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt index 2ad7f68d..6c9044b4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 647b5a30..ad63b6e8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTest @@ -45,23 +45,35 @@ class ChannelItemTest: SerDeTest() { fun bindings(): Map { return mapOf( Pair("amqp", AMQPV0_2_0Test.channelBinding()), - Pair("amqp1", Reference("#/components/channelBindings/amqp1")), + Pair("amqp1", + Reference("#/components/channelBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", Reference("#/components/channelBindings/jms")), Pair("kafka", KafkaV0_4_0Test.channelBinding()), - Pair("mercure", Reference("#/components/channelBindings/mercure")), + Pair("mercure", + Reference("#/components/channelBindings/mercure") + ), Pair("mqtt", Reference("#/components/channelBindings/mqtt")), - Pair("mqtt5", Reference("#/components/channelBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/channelBindings/mqtt5") + ), Pair("nats", Reference("#/components/channelBindings/nats")), Pair("pulsar", PulsarV0_1_0Test.channelBinding()), - Pair("redis", Reference("#/components/channelBindings/redis")), + Pair("redis", + Reference("#/components/channelBindings/redis") + ), Pair("sns", Reference("#/components/channelBindings/sns")), - Pair("solace", Reference("#/components/channelBindings/solace")), + Pair("solace", + Reference("#/components/channelBindings/solace") + ), Pair("sqs", Reference("#/components/channelBindings/sqs")), - Pair("stomp", Reference("#/components/channelBindings/stomp")), + Pair("stomp", + Reference("#/components/channelBindings/stomp") + ), Pair("ws", WebSocketsV0_1_0Test.channelBinding()) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt index 3cf2e882..dd0cb00a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2.schema.Schema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index de84d834..ac1b91ed 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag @@ -80,7 +80,7 @@ class MessageTest: SerDeTest() { .bindings(bindings()) .examples(listOf(MessageExampleTest().build())) .traits(listOf( - Reference("#/components/messageTraits/commonHeaders"), + Reference("#/components/messageTraits/commonHeaders"), )) .build() } @@ -89,23 +89,37 @@ class MessageTest: SerDeTest() { fun bindings(): Map { return mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), - Pair("amqp1", Reference("#/components/messageBindings/amqp1")), + Pair("amqp1", + Reference("#/components/messageBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaV0_4_0Test.messageBinding()), - Pair("mercure", Reference("#/components/messageBindings/mercure")), + Pair("mercure", + Reference("#/components/messageBindings/mercure") + ), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), - Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/messageBindings/mqtt5") + ), Pair("nats", Reference("#/components/messageBindings/nats")), - Pair("pulsar", Reference("#/components/messageBindings/pulsar")), - Pair("redis", Reference("#/components/messageBindings/redis")), + Pair("pulsar", + Reference("#/components/messageBindings/pulsar") + ), + Pair("redis", + Reference("#/components/messageBindings/redis") + ), Pair("sns", Reference("#/components/messageBindings/sns")), - Pair("solace", Reference("#/components/messageBindings/solace")), + Pair("solace", + Reference("#/components/messageBindings/solace") + ), Pair("sqs", Reference("#/components/messageBindings/sqs")), - Pair("stomp", Reference("#/components/messageBindings/stomp")), + Pair("stomp", + Reference("#/components/messageBindings/stomp") + ), Pair("ws", Reference("#/components/messageBindings/ws")) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index eb674ab3..035dd846 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag @@ -61,23 +61,45 @@ class MessageTraitTest: SerDeTest() { .externalDocs(ExternalDocumentation("User sign up rules", "messages/sign-up-rules")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), - Pair("amqp1", Reference("#/components/messageBindings/amqp1")), + Pair("amqp1", + Reference("#/components/messageBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), - Pair("jms", Reference("#/components/messageBindings/jms")), + Pair("jms", + Reference("#/components/messageBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.messageBinding()), - Pair("mercure", Reference("#/components/messageBindings/mercure")), + Pair("mercure", + Reference("#/components/messageBindings/mercure") + ), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), - Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), - Pair("nats", Reference("#/components/messageBindings/nats")), - Pair("pulsar", Reference("#/components/messageBindings/pulsar")), - Pair("redis", Reference("#/components/messageBindings/redis")), - Pair("sns", Reference("#/components/messageBindings/sns")), - Pair("solace", Reference("#/components/messageBindings/solace")), - Pair("sqs", Reference("#/components/messageBindings/sqs")), - Pair("stomp", Reference("#/components/messageBindings/stomp")), + Pair("mqtt5", + Reference("#/components/messageBindings/mqtt5") + ), + Pair("nats", + Reference("#/components/messageBindings/nats") + ), + Pair("pulsar", + Reference("#/components/messageBindings/pulsar") + ), + Pair("redis", + Reference("#/components/messageBindings/redis") + ), + Pair("sns", + Reference("#/components/messageBindings/sns") + ), + Pair("solace", + Reference("#/components/messageBindings/solace") + ), + Pair("sqs", + Reference("#/components/messageBindings/sqs") + ), + Pair("stomp", + Reference("#/components/messageBindings/stomp") + ), Pair("ws", Reference("#/components/messageBindings/ws")) )) .examples(listOf(MessageExampleTest().build())) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt index 408f50ea..c84fc858 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.message import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName @@ -26,7 +26,7 @@ class OneOfMessagesTest { @JvmStatic fun build(): OneOfMessages { return OneOfMessages(listOf( - Reference("#/components/schemas/sendMessage"), + Reference("#/components/schemas/sendMessage"), MessageTest().build() )) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 4b033ed2..6f6c67c0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.operation -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag @@ -43,7 +43,7 @@ class OperationWithReferenceToMessageTest: SerDeTest() { .externalDocs(ExternalDocumentation("Messages sending rules", "messages/sending-rules")) .bindings(OperationTest.bindings()) .traits(listOf( - Reference("#/components/operationTraits/sendMessage"), + Reference("#/components/operationTraits/sendMessage"), OperationTraitTest().build() )) .message(Reference("#/components/schemas/sendMessage")) @@ -82,7 +82,7 @@ class OperationWithMessageTest: SerDeTest() { .externalDocs(ExternalDocumentation("Messages sending rules", "messages/sending-rules")) .bindings(OperationTest.bindings()) .traits(listOf( - Reference("#/components/operationTraits/sendMessage"), + Reference("#/components/operationTraits/sendMessage"), OperationTraitTest().build() )) .message(MessageTest().build()) @@ -120,11 +120,11 @@ class OperationWithOneOfMessageTest: SerDeTest() { .externalDocs(ExternalDocumentation("Messages sending rules", "messages/sending-rules")) .bindings(OperationTest.bindings()) .traits(listOf( - Reference("#/components/operationTraits/sendMessage"), + Reference("#/components/operationTraits/sendMessage"), OperationTraitTest().build() )) .message(OneOfMessages(listOf( - Reference("#/components/schemas/sendMessage"), + Reference("#/components/schemas/sendMessage"), MessageTest().build() ))) .build() @@ -137,23 +137,41 @@ class OperationTest { fun bindings(): Map { return mapOf( Pair("amqp", AMQPV0_2_0Test.operationBinding()), - Pair("amqp1", Reference("#/components/operationBindings/amqp1")), - Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), - Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), + Pair("amqp1", + Reference("#/components/operationBindings/amqp1") + ), + Pair("anypointmq", + Reference("#/components/operationBindings/anypointmq") + ), + Pair("googlepubsub", + Reference("#/components/operationBindings/googlepubsub") + ), Pair("http", HTTPV0_3_0Test.operationBinding()), - Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), + Pair("ibmmq", + Reference("#/components/operationBindings/ibmmq") + ), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaV0_4_0Test.operationBinding()), - Pair("mercure", Reference("#/components/operationBindings/mercure")), + Pair("mercure", + Reference("#/components/operationBindings/mercure") + ), Pair("mqtt", MQTTV0_1_0Test.operationBinding()), - Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/operationBindings/mqtt5") + ), Pair("nats", NATSV0_1_0Test.operationBinding()), - Pair("pulsar", Reference("#/components/operationBindings/pulsar")), - Pair("redis", Reference("#/components/operationBindings/redis")), + Pair("pulsar", + Reference("#/components/operationBindings/pulsar") + ), + Pair("redis", + Reference("#/components/operationBindings/redis") + ), Pair("sns", Reference("#/components/operationBindings/sns")), Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs")), - Pair("stomp", Reference("#/components/operationBindings/stomp")), + Pair("stomp", + Reference("#/components/operationBindings/stomp") + ), Pair("ws", Reference("#/components/operationBindings/ws")) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 6c66ba72..62161d3d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.operation -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag @@ -41,24 +41,50 @@ class OperationTraitTest: SerDeTest() { .externalDocs(ExternalDocumentation("Messages sending rules", "messages/sending-rules")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.operationBinding()), - Pair("amqp1", Reference("#/components/operationBindings/amqp1")), - Pair("anypointmq", Reference("#/components/operationBindings/anypointmq")), - Pair("googlepubsub", Reference("#/components/operationBindings/googlepubsub")), + Pair("amqp1", + Reference("#/components/operationBindings/amqp1") + ), + Pair("anypointmq", + Reference("#/components/operationBindings/anypointmq") + ), + Pair("googlepubsub", + Reference("#/components/operationBindings/googlepubsub") + ), Pair("http", HTTPV0_3_0Test.operationBinding()), - Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), - Pair("jms", Reference("#/components/operationBindings/jms")), + Pair("ibmmq", + Reference("#/components/operationBindings/ibmmq") + ), + Pair("jms", + Reference("#/components/operationBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.operationBinding()), - Pair("mercure", Reference("#/components/operationBindings/mercure")), + Pair("mercure", + Reference("#/components/operationBindings/mercure") + ), Pair("mqtt", MQTTV0_1_0Test.operationBinding()), - Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/operationBindings/mqtt5") + ), Pair("nats", NATSV0_1_0Test.operationBinding()), - Pair("pulsar", Reference("#/components/operationBindings/pulsar")), - Pair("redis", Reference("#/components/operationBindings/redis")), - Pair("sns", Reference("#/components/operationBindings/sns")), + Pair("pulsar", + Reference("#/components/operationBindings/pulsar") + ), + Pair("redis", + Reference("#/components/operationBindings/redis") + ), + Pair("sns", + Reference("#/components/operationBindings/sns") + ), Pair("solace", SolaceV0_3_0Test.operationBinding()), - Pair("sqs", Reference("#/components/operationBindings/sqs")), - Pair("stomp", Reference("#/components/operationBindings/stomp")), - Pair("ws", Reference("#/components/operationBindings/ws")) + Pair("sqs", + Reference("#/components/operationBindings/sqs") + ), + Pair("stomp", + Reference("#/components/operationBindings/stomp") + ), + Pair("ws", + Reference("#/components/operationBindings/ws") + ) )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt index f2b69d0c..2798c496 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.component -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.schema.Type @@ -58,51 +58,81 @@ class ComponentsTest: SerDeTest() { )) .servers(mapOf( Pair("mqtt-test", ServerTest().build()), - Pair("mqtt-stage", Reference("#/components/servers/mqtt-stage")) + Pair("mqtt-stage", + Reference("#/components/servers/mqtt-stage") + ) )) .serverVariables(mapOf( Pair("port", ServerVariableTest().build()), - Pair("basePath", Reference("#/components/serverVariables/basePath")) + Pair("basePath", + Reference("#/components/serverVariables/basePath") + ) )) .channels(mapOf( Pair("sign-up", ChannelItemTest().build()), )) .messages(mapOf( Pair("userSignup", MessageTest().build()), - Pair("userSignout", Reference("#/components/messages/userSignout")) + Pair("userSignout", + Reference("#/components/messages/userSignout") + ) )) .securitySchemes(mapOf( Pair("apiKey", ApiKeySecuritySchemeTest().build()), - Pair("asymmetricEncryption", Reference("#/components/securitySchemes/asymmetricEncryption")), - Pair("gssapi", Reference("#/components/securitySchemes/gssapi")), + Pair("asymmetricEncryption", + Reference("#/components/securitySchemes/asymmetricEncryption") + ), + Pair("gssapi", + Reference("#/components/securitySchemes/gssapi") + ), Pair("oauth2", OAuth2SecuritySchemeTest().build()), Pair("openIdConnect", OpenIdConnectSecuritySchemeTest().build()), Pair("httpApiKey", HttpApiKeySecuritySchemeTest().build()), Pair("httpBasic", HttpSecuritySchemeBasicTest().build()), Pair("httpBearer", HttpSecuritySchemeBearerTest().build()), - Pair("plain", Reference("#/components/securitySchemes/plain")), - Pair("scramSha256", Reference("#/components/securitySchemes/scramSha256")), - Pair("scramSha512", Reference("#/components/securitySchemes/scramSha512")), - Pair("symmetricEncryption", Reference("#/components/securitySchemes/symmetricEncryption")), - Pair("userPassword", Reference("#/components/securitySchemes/userPassword")), - Pair("X509", Reference("#/components/securitySchemes/X509")), + Pair("plain", + Reference("#/components/securitySchemes/plain") + ), + Pair("scramSha256", + Reference("#/components/securitySchemes/scramSha256") + ), + Pair("scramSha512", + Reference("#/components/securitySchemes/scramSha512") + ), + Pair("symmetricEncryption", + Reference("#/components/securitySchemes/symmetricEncryption") + ), + Pair("userPassword", + Reference("#/components/securitySchemes/userPassword") + ), + Pair("X509", + Reference("#/components/securitySchemes/X509") + ), )) .parameters(mapOf( Pair("parameterWithSchema", ParameterWithSchemaTest().build()), Pair("parameterWithSchemaReference", ParameterWithReferenceToSchemaTest().build()), - Pair("parameter", Reference("#/components/parameters/parameter")) + Pair("parameter", + Reference("#/components/parameters/parameter") + ) )) .correlationIds(mapOf( Pair("userSignupCorrelationId", CorrelationIdTest().build()), - Pair("correlationId", Reference("#/correlationIds/parameters/correlationId")) + Pair("correlationId", + Reference("#/correlationIds/parameters/correlationId") + ) )) .operationTraits(mapOf( Pair("sendMessage", OperationTraitTest().build()), - Pair("deleteMessage", Reference("#/components/operationTraits/deleteMessage")) + Pair("deleteMessage", + Reference("#/components/operationTraits/deleteMessage") + ) )) .messageTraits(mapOf( Pair("userSignup", MessageTraitTest().build()), - Pair("userSignout", Reference("#/components/messageTraits/userSignout")) + Pair("userSignout", + Reference("#/components/messageTraits/userSignout") + ) )) .serverBindings(ServerTest.bindings()) .channelBindings(ChannelItemTest.bindings()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index 04a463ff..bf4a838c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.server -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; @@ -52,7 +52,9 @@ class ServerTest: SerDeTest() { .enumValues(listOf("8883", "8884")) .defaultValue("8883") .build()), - Pair("basePath", Reference("#/components/serverVariables/basePath")) + Pair("basePath", + Reference("#/components/serverVariables/basePath") + ) )) .security(listOf(mapOf( Pair("mqttBroker", emptyList()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt index 14d83376..feba59c1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3 -import com.asyncapi.ExtendableObject +import com.asyncapi.schemas.ExtendableObject import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.JsonMappingException import com.fasterxml.jackson.databind.ObjectMapper diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt index e9ee8bcf..b243668a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.channel.ChannelTest import com.asyncapi.v3._0_0.model.channel.ChannelTestWithReference @@ -33,12 +33,16 @@ class AsyncAPITest: SerDeTest() { mapOf( Pair("server 1", ServerTest().build()), Pair("server 2", ServerTestWithReference().build()), - Pair("server 3", Reference("#/components/servers/server")) + Pair("server 3", + Reference("#/components/servers/server") + ) ), mapOf( Pair("channel 1", ChannelTest().build()), Pair("channel 2", ChannelTestWithReference().build()), - Pair("channel 3", Reference("#/components/channels/channel")) + Pair("channel 3", + Reference("#/components/channels/channel") + ) ), mapOf( Pair("operation 1", OperationTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt index ea0d0a19..fe3d6a5a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt index d35102e9..f6d1efe6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index af2ccaf1..3aa41a94 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.TagTest @@ -65,23 +65,35 @@ class ChannelTest: SerDeTest() { fun bindings(): Map { return mapOf( Pair("amqp", AMQPV0_2_0Test.channelBinding()), - Pair("amqp1", Reference("#/components/channelBindings/amqp1")), + Pair("amqp1", + Reference("#/components/channelBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", Reference("#/components/channelBindings/jms")), Pair("kafka", KafkaV0_4_0Test.channelBinding()), - Pair("mercure", Reference("#/components/channelBindings/mercure")), + Pair("mercure", + Reference("#/components/channelBindings/mercure") + ), Pair("mqtt", Reference("#/components/channelBindings/mqtt")), - Pair("mqtt5", Reference("#/components/channelBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/channelBindings/mqtt5") + ), Pair("nats", Reference("#/components/channelBindings/nats")), Pair("pulsar", PulsarV0_1_0Test.channelBinding()), - Pair("redis", Reference("#/components/channelBindings/redis")), + Pair("redis", + Reference("#/components/channelBindings/redis") + ), Pair("sns", Reference("#/components/channelBindings/sns")), - Pair("solace", Reference("#/components/channelBindings/solace")), + Pair("solace", + Reference("#/components/channelBindings/solace") + ), Pair("sqs", Reference("#/components/channelBindings/sqs")), - Pair("stomp", Reference("#/components/channelBindings/stomp")), + Pair("stomp", + Reference("#/components/channelBindings/stomp") + ), Pair("ws", WebSocketsV0_1_0Test.channelBinding()) ) } @@ -138,23 +150,35 @@ class ChannelTestWithReference: SerDeTest() { fun bindings(): Map { return mapOf( Pair("amqp", AMQPV0_2_0Test.channelBinding()), - Pair("amqp1", Reference("#/components/channelBindings/amqp1")), + Pair("amqp1", + Reference("#/components/channelBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), Pair("http", Reference("#/components/channelBindings/http")), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", Reference("#/components/channelBindings/jms")), Pair("kafka", KafkaV0_4_0Test.channelBinding()), - Pair("mercure", Reference("#/components/channelBindings/mercure")), + Pair("mercure", + Reference("#/components/channelBindings/mercure") + ), Pair("mqtt", Reference("#/components/channelBindings/mqtt")), - Pair("mqtt5", Reference("#/components/channelBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/channelBindings/mqtt5") + ), Pair("nats", Reference("#/components/channelBindings/nats")), Pair("pulsar", PulsarV0_1_0Test.channelBinding()), - Pair("redis", Reference("#/components/channelBindings/redis")), + Pair("redis", + Reference("#/components/channelBindings/redis") + ), Pair("sns", Reference("#/components/channelBindings/sns")), - Pair("solace", Reference("#/components/channelBindings/solace")), + Pair("solace", + Reference("#/components/channelBindings/solace") + ), Pair("sqs", Reference("#/components/channelBindings/sqs")), - Pair("stomp", Reference("#/components/channelBindings/stomp")), + Pair("stomp", + Reference("#/components/channelBindings/stomp") + ), Pair("ws", WebSocketsV0_1_0Test.channelBinding()) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 9a4d60d9..3c70a9b6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag @@ -85,23 +85,37 @@ class MessageTestWithSchema: SerDeTest() { fun bindings(): Map { return mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), - Pair("amqp1", Reference("#/components/messageBindings/amqp1")), + Pair("amqp1", + Reference("#/components/messageBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", Reference("#/components/messageBindings/jms")), Pair("kafka", KafkaV0_4_0Test.messageBinding()), - Pair("mercure", Reference("#/components/messageBindings/mercure")), + Pair("mercure", + Reference("#/components/messageBindings/mercure") + ), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), - Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/messageBindings/mqtt5") + ), Pair("nats", Reference("#/components/messageBindings/nats")), - Pair("pulsar", Reference("#/components/messageBindings/pulsar")), - Pair("redis", Reference("#/components/messageBindings/redis")), + Pair("pulsar", + Reference("#/components/messageBindings/pulsar") + ), + Pair("redis", + Reference("#/components/messageBindings/redis") + ), Pair("sns", Reference("#/components/messageBindings/sns")), - Pair("solace", Reference("#/components/messageBindings/solace")), + Pair("solace", + Reference("#/components/messageBindings/solace") + ), Pair("sqs", Reference("#/components/messageBindings/sqs")), - Pair("stomp", Reference("#/components/messageBindings/stomp")), + Pair("stomp", + Reference("#/components/messageBindings/stomp") + ), Pair("ws", Reference("#/components/messageBindings/ws")) ) } @@ -138,25 +152,45 @@ class MessageTestWithReference: SerDeTest() { .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), - Pair("amqp1", Reference("#/components/messageBindings/amqp1")), + Pair("amqp1", + Reference("#/components/messageBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), - Pair("jms", Reference("#/components/messageBindings/jms")), + Pair("jms", + Reference("#/components/messageBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), - Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), - Pair("nats", Reference("#/components/messageBindings/nats")), - Pair("pulsar", Reference("#/components/messageBindings/pulsar")), - Pair("redis", Reference("#/components/messageBindings/redis")), - Pair("sns", Reference("#/components/messageBindings/sns")), - Pair("solace", Reference("#/components/messageBindings/solace")), - Pair("sqs", Reference("#/components/messageBindings/sqs")), - Pair("stomp", Reference("#/components/messageBindings/stomp")), + Pair("mqtt5", + Reference("#/components/messageBindings/mqtt5") + ), + Pair("nats", + Reference("#/components/messageBindings/nats") + ), + Pair("pulsar", + Reference("#/components/messageBindings/pulsar") + ), + Pair("redis", + Reference("#/components/messageBindings/redis") + ), + Pair("sns", + Reference("#/components/messageBindings/sns") + ), + Pair("solace", + Reference("#/components/messageBindings/solace") + ), + Pair("sqs", + Reference("#/components/messageBindings/sqs") + ), + Pair("stomp", + Reference("#/components/messageBindings/stomp") + ), Pair("ws", Reference("#/components/messageBindings/ws")) )) .examples(listOf(MessageExampleTest().build())) @@ -228,25 +262,45 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), - Pair("amqp1", Reference("#/components/messageBindings/amqp1")), + Pair("amqp1", + Reference("#/components/messageBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), - Pair("jms", Reference("#/components/messageBindings/jms")), + Pair("jms", + Reference("#/components/messageBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), - Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), - Pair("nats", Reference("#/components/messageBindings/nats")), - Pair("pulsar", Reference("#/components/messageBindings/pulsar")), - Pair("redis", Reference("#/components/messageBindings/redis")), - Pair("sns", Reference("#/components/messageBindings/sns")), - Pair("solace", Reference("#/components/messageBindings/solace")), - Pair("sqs", Reference("#/components/messageBindings/sqs")), - Pair("stomp", Reference("#/components/messageBindings/stomp")), + Pair("mqtt5", + Reference("#/components/messageBindings/mqtt5") + ), + Pair("nats", + Reference("#/components/messageBindings/nats") + ), + Pair("pulsar", + Reference("#/components/messageBindings/pulsar") + ), + Pair("redis", + Reference("#/components/messageBindings/redis") + ), + Pair("sns", + Reference("#/components/messageBindings/sns") + ), + Pair("solace", + Reference("#/components/messageBindings/solace") + ), + Pair("sqs", + Reference("#/components/messageBindings/sqs") + ), + Pair("stomp", + Reference("#/components/messageBindings/stomp") + ), Pair("ws", Reference("#/components/messageBindings/ws")) )) .examples(listOf(MessageExampleTest().build())) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 354966a4..8aba7af7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag @@ -60,25 +60,45 @@ class MessageTraitTestWithSchema: SerDeTest() { .externalDocs(ExternalDocumentation("User sign up rules", "messages/sign-up-rules")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), - Pair("amqp1", Reference("#/components/messageBindings/amqp1")), + Pair("amqp1", + Reference("#/components/messageBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), - Pair("jms", Reference("#/components/messageBindings/jms")), + Pair("jms", + Reference("#/components/messageBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), - Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), - Pair("nats", Reference("#/components/messageBindings/nats")), - Pair("pulsar", Reference("#/components/messageBindings/pulsar")), - Pair("redis", Reference("#/components/messageBindings/redis")), - Pair("sns", Reference("#/components/messageBindings/sns")), - Pair("solace", Reference("#/components/messageBindings/solace")), - Pair("sqs", Reference("#/components/messageBindings/sqs")), - Pair("stomp", Reference("#/components/messageBindings/stomp")), + Pair("mqtt5", + Reference("#/components/messageBindings/mqtt5") + ), + Pair("nats", + Reference("#/components/messageBindings/nats") + ), + Pair("pulsar", + Reference("#/components/messageBindings/pulsar") + ), + Pair("redis", + Reference("#/components/messageBindings/redis") + ), + Pair("sns", + Reference("#/components/messageBindings/sns") + ), + Pair("solace", + Reference("#/components/messageBindings/solace") + ), + Pair("sqs", + Reference("#/components/messageBindings/sqs") + ), + Pair("stomp", + Reference("#/components/messageBindings/stomp") + ), Pair("ws", Reference("#/components/messageBindings/ws")) )) .examples(listOf(MessageExampleTest().build())) @@ -115,25 +135,45 @@ class MessageTraitTestWithReference: SerDeTest() { .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), - Pair("amqp1", Reference("#/components/messageBindings/amqp1")), + Pair("amqp1", + Reference("#/components/messageBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), - Pair("jms", Reference("#/components/messageBindings/jms")), + Pair("jms", + Reference("#/components/messageBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), - Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), - Pair("nats", Reference("#/components/messageBindings/nats")), - Pair("pulsar", Reference("#/components/messageBindings/pulsar")), - Pair("redis", Reference("#/components/messageBindings/redis")), - Pair("sns", Reference("#/components/messageBindings/sns")), - Pair("solace", Reference("#/components/messageBindings/solace")), - Pair("sqs", Reference("#/components/messageBindings/sqs")), - Pair("stomp", Reference("#/components/messageBindings/stomp")), + Pair("mqtt5", + Reference("#/components/messageBindings/mqtt5") + ), + Pair("nats", + Reference("#/components/messageBindings/nats") + ), + Pair("pulsar", + Reference("#/components/messageBindings/pulsar") + ), + Pair("redis", + Reference("#/components/messageBindings/redis") + ), + Pair("sns", + Reference("#/components/messageBindings/sns") + ), + Pair("solace", + Reference("#/components/messageBindings/solace") + ), + Pair("sqs", + Reference("#/components/messageBindings/sqs") + ), + Pair("stomp", + Reference("#/components/messageBindings/stomp") + ), Pair("ws", Reference("#/components/messageBindings/ws")) )) .examples(listOf(MessageExampleTest().build())) @@ -187,25 +227,45 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.messageBinding()), - Pair("amqp1", Reference("#/components/messageBindings/amqp1")), + Pair("amqp1", + Reference("#/components/messageBindings/amqp1") + ), Pair("anypointmq", AnypointMQV0_0_1Test.messageBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), - Pair("jms", Reference("#/components/messageBindings/jms")), + Pair("jms", + Reference("#/components/messageBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), - Pair("mqtt5", Reference("#/components/messageBindings/mqtt5")), - Pair("nats", Reference("#/components/messageBindings/nats")), - Pair("pulsar", Reference("#/components/messageBindings/pulsar")), - Pair("redis", Reference("#/components/messageBindings/redis")), - Pair("sns", Reference("#/components/messageBindings/sns")), - Pair("solace", Reference("#/components/messageBindings/solace")), - Pair("sqs", Reference("#/components/messageBindings/sqs")), - Pair("stomp", Reference("#/components/messageBindings/stomp")), + Pair("mqtt5", + Reference("#/components/messageBindings/mqtt5") + ), + Pair("nats", + Reference("#/components/messageBindings/nats") + ), + Pair("pulsar", + Reference("#/components/messageBindings/pulsar") + ), + Pair("redis", + Reference("#/components/messageBindings/redis") + ), + Pair("sns", + Reference("#/components/messageBindings/sns") + ), + Pair("solace", + Reference("#/components/messageBindings/solace") + ), + Pair("sqs", + Reference("#/components/messageBindings/sqs") + ), + Pair("stomp", + Reference("#/components/messageBindings/stomp") + ), Pair("ws", Reference("#/components/messageBindings/ws")) )) .examples(listOf(MessageExampleTest().build())) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt index 1225cfb5..368eb9f7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.component -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.TagTest @@ -79,7 +79,9 @@ class ComponentsTest: SerDeTest() { )) .servers(mapOf( Pair("mqtt-test", ServerTest().build()), - Pair("mqtt-stage", Reference("#/components/servers/mqtt-stage")) + Pair("mqtt-stage", + Reference("#/components/servers/mqtt-stage") + ) )) .serverVariables(mapOf( Pair("port", ServerVariableTest().build()), @@ -90,7 +92,9 @@ class ComponentsTest: SerDeTest() { .channels(mapOf( Pair("channel 1", ChannelTest().build()), Pair("channel 2", ChannelTestWithReference().build()), - Pair("channel 3", Reference("#/components/channels/channel")), + Pair("channel 3", + Reference("#/components/channels/channel") + ), )) .operations(mapOf( Pair("operation 1", OperationTest().build()), @@ -114,20 +118,26 @@ class ComponentsTest: SerDeTest() { Pair("message 1", MessageTestWithSchema().build()), Pair("message 2", MessageTestWithMultiFormatSchema().build()), Pair("message 3", MessageTestWithReference().build()), - Pair("message 4", Reference("#/components/messages/message")) + Pair("message 4", + Reference("#/components/messages/message") + ) )) .securitySchemes(mapOf( Pair("apiKey", ApiKeySecuritySchemeTest().build()), Pair("asymmetricEncryption", Reference("#/components/securitySchemes/asymmetricEncryption") ), - Pair("gssapi", Reference("#/components/securitySchemes/gssapi")), + Pair("gssapi", + Reference("#/components/securitySchemes/gssapi") + ), Pair("oauth2", OAuth2SecuritySchemeTest().build()), Pair("openIdConnect", OpenIdConnectSecuritySchemeTest().build()), Pair("httpApiKey", HttpApiKeySecuritySchemeTest().build()), Pair("httpBasic", HttpSecuritySchemeBasicTest().build()), Pair("httpBearer", HttpSecuritySchemeBearerTest().build()), - Pair("plain", Reference("#/components/securitySchemes/plain")), + Pair("plain", + Reference("#/components/securitySchemes/plain") + ), Pair("scramSha256", Reference("#/components/securitySchemes/scramSha256") ), @@ -140,7 +150,9 @@ class ComponentsTest: SerDeTest() { Pair("userPassword", Reference("#/components/securitySchemes/userPassword") ), - Pair("X509", Reference("#/components/securitySchemes/X509")), + Pair("X509", + Reference("#/components/securitySchemes/X509") + ), )) .parameters(mapOf( Pair("parameter 1", ParameterTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt index ec289400..976cb2a0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.TagTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index fe710870..83213813 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.SolaceV0_3_0Test -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag @@ -64,7 +64,9 @@ class OperationTest: SerDeTest() { fun bindings(): Map { return mapOf( Pair("amqp", AMQPV0_2_0Test.operationBinding()), - Pair("amqp1", Reference("#/components/operationBindings/amqp1")), + Pair("amqp1", + Reference("#/components/operationBindings/amqp1") + ), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq") ), @@ -72,19 +74,31 @@ class OperationTest: SerDeTest() { Reference("#/components/operationBindings/googlepubsub") ), Pair("http", HTTPV0_3_0Test.operationBinding()), - Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), + Pair("ibmmq", + Reference("#/components/operationBindings/ibmmq") + ), Pair("jms", Reference("#/components/operationBindings/jms")), Pair("kafka", KafkaV0_4_0Test.operationBinding()), - Pair("mercure", Reference("#/components/operationBindings/mercure")), + Pair("mercure", + Reference("#/components/operationBindings/mercure") + ), Pair("mqtt", MQTTV0_1_0Test.operationBinding()), - Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/operationBindings/mqtt5") + ), Pair("nats", NATSV0_1_0Test.operationBinding()), - Pair("pulsar", Reference("#/components/operationBindings/pulsar")), - Pair("redis", Reference("#/components/operationBindings/redis")), + Pair("pulsar", + Reference("#/components/operationBindings/pulsar") + ), + Pair("redis", + Reference("#/components/operationBindings/redis") + ), Pair("sns", Reference("#/components/operationBindings/sns")), Pair("solace", SolaceV0_3_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs")), - Pair("stomp", Reference("#/components/operationBindings/stomp")), + Pair("stomp", + Reference("#/components/operationBindings/stomp") + ), Pair("ws", Reference("#/components/operationBindings/ws")) ) } @@ -122,7 +136,9 @@ class OperationTestWithReference: SerDeTest() { .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.operationBinding()), - Pair("amqp1", Reference("#/components/operationBindings/amqp1")), + Pair("amqp1", + Reference("#/components/operationBindings/amqp1") + ), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq") ), @@ -130,24 +146,40 @@ class OperationTestWithReference: SerDeTest() { Reference("#/components/operationBindings/googlepubsub") ), Pair("http", HTTPV0_3_0Test.operationBinding()), - Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), - Pair("jms", Reference("#/components/operationBindings/jms")), + Pair("ibmmq", + Reference("#/components/operationBindings/ibmmq") + ), + Pair("jms", + Reference("#/components/operationBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), Pair("mqtt", MQTTV0_1_0Test.operationBinding()), - Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/operationBindings/mqtt5") + ), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar") ), - Pair("redis", Reference("#/components/operationBindings/redis")), - Pair("sns", Reference("#/components/operationBindings/sns")), + Pair("redis", + Reference("#/components/operationBindings/redis") + ), + Pair("sns", + Reference("#/components/operationBindings/sns") + ), Pair("solace", SolaceV0_3_0Test.operationBinding()), - Pair("sqs", Reference("#/components/operationBindings/sqs")), - Pair("stomp", Reference("#/components/operationBindings/stomp")), - Pair("ws", Reference("#/components/operationBindings/ws")) + Pair("sqs", + Reference("#/components/operationBindings/sqs") + ), + Pair("stomp", + Reference("#/components/operationBindings/stomp") + ), + Pair("ws", + Reference("#/components/operationBindings/ws") + ) )) .traits(listOf( OperationTraitTest().build(), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 27e7e5a9..e6db2cab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.SolaceV0_3_0Test -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag @@ -44,7 +44,9 @@ class OperationTraitTest: SerDeTest() { .externalDocs(ExternalDocumentation("Messages validation rules", "messages/validation-rules")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.operationBinding()), - Pair("amqp1", Reference("#/components/operationBindings/amqp1")), + Pair("amqp1", + Reference("#/components/operationBindings/amqp1") + ), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq") ), @@ -52,24 +54,40 @@ class OperationTraitTest: SerDeTest() { Reference("#/components/operationBindings/googlepubsub") ), Pair("http", HTTPV0_3_0Test.operationBinding()), - Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), - Pair("jms", Reference("#/components/operationBindings/jms")), + Pair("ibmmq", + Reference("#/components/operationBindings/ibmmq") + ), + Pair("jms", + Reference("#/components/operationBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), Pair("mqtt", MQTTV0_1_0Test.operationBinding()), - Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/operationBindings/mqtt5") + ), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar") ), - Pair("redis", Reference("#/components/operationBindings/redis")), - Pair("sns", Reference("#/components/operationBindings/sns")), + Pair("redis", + Reference("#/components/operationBindings/redis") + ), + Pair("sns", + Reference("#/components/operationBindings/sns") + ), Pair("solace", SolaceV0_3_0Test.operationBinding()), - Pair("sqs", Reference("#/components/operationBindings/sqs")), - Pair("stomp", Reference("#/components/operationBindings/stomp")), - Pair("ws", Reference("#/components/operationBindings/ws")) + Pair("sqs", + Reference("#/components/operationBindings/sqs") + ), + Pair("stomp", + Reference("#/components/operationBindings/stomp") + ), + Pair("ws", + Reference("#/components/operationBindings/ws") + ) )) .build() } @@ -104,7 +122,9 @@ class OperationTraitTestWithReference: SerDeTest() { .externalDocs(Reference("#/components/externalDocs/external-doc")) .bindings(mapOf( Pair("amqp", AMQPV0_2_0Test.operationBinding()), - Pair("amqp1", Reference("#/components/operationBindings/amqp1")), + Pair("amqp1", + Reference("#/components/operationBindings/amqp1") + ), Pair("anypointmq", Reference("#/components/operationBindings/anypointmq") ), @@ -112,24 +132,40 @@ class OperationTraitTestWithReference: SerDeTest() { Reference("#/components/operationBindings/googlepubsub") ), Pair("http", HTTPV0_3_0Test.operationBinding()), - Pair("ibmmq", Reference("#/components/operationBindings/ibmmq")), - Pair("jms", Reference("#/components/operationBindings/jms")), + Pair("ibmmq", + Reference("#/components/operationBindings/ibmmq") + ), + Pair("jms", + Reference("#/components/operationBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), Pair("mqtt", MQTTV0_1_0Test.operationBinding()), - Pair("mqtt5", Reference("#/components/operationBindings/mqtt5")), + Pair("mqtt5", + Reference("#/components/operationBindings/mqtt5") + ), Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", Reference("#/components/operationBindings/pulsar") ), - Pair("redis", Reference("#/components/operationBindings/redis")), - Pair("sns", Reference("#/components/operationBindings/sns")), + Pair("redis", + Reference("#/components/operationBindings/redis") + ), + Pair("sns", + Reference("#/components/operationBindings/sns") + ), Pair("solace", SolaceV0_3_0Test.operationBinding()), - Pair("sqs", Reference("#/components/operationBindings/sqs")), - Pair("stomp", Reference("#/components/operationBindings/stomp")), - Pair("ws", Reference("#/components/operationBindings/ws")) + Pair("sqs", + Reference("#/components/operationBindings/sqs") + ), + Pair("stomp", + Reference("#/components/operationBindings/stomp") + ), + Pair("ws", + Reference("#/components/operationBindings/ws") + ) )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt index 2b3adaf6..a57e08bf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation.reply -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index af387456..d0acea5e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.server -import com.asyncapi.Reference +import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.Tag From 3817514cf3e565b01f77ddd195706be4344cbbed Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:21:08 +0400 Subject: [PATCH 069/141] feat(schemas): move Type to schemas package --- .../src/main/java/com/asyncapi/{v3/schema => schemas}/Type.java | 2 +- .../com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java | 2 +- .../test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java | 2 +- .../test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java | 2 +- .../test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java | 2 +- .../kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java | 2 +- .../com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java | 2 +- .../com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/Type.java (93%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/Type.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/Type.java similarity index 93% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/Type.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/Type.java index 653130e5..288cdce0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/Type.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/Type.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema; +package com.asyncapi.schemas; /** * Json Schema type. diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java index 1cfd533f..579ae5ff 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; +import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java index 13dc856d..591a373d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java @@ -8,7 +8,7 @@ import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType; import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; +import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java index 95ca7ba4..ff29d6ee 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.http.v0._2_0.operation.HTTPOperationMethod; import com.asyncapi.bindings.http.v0._2_0.server.HTTPServerBinding; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; +import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java index 48f5dd31..70d79aae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod; import com.asyncapi.bindings.http.v0._3_0.server.HTTPServerBinding; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; +import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java index 4c6aa382..2eeb41fe 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java @@ -9,7 +9,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; +import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java index af850cff..c4b7e3ab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.Type; +import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt index 368eb9f7..a8ac0da4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.v3._0_0.model.server.ServerTest import com.asyncapi.v3._0_0.model.server.ServerVariableTest import com.asyncapi.v3.schema.AsyncAPISchema import com.asyncapi.v3.schema.JsonSchema -import com.asyncapi.v3.schema.Type +import com.asyncapi.schemas.Type import com.asyncapi.v3.schema.multiformat.JsonFormatSchema import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest import com.asyncapi.v3.security_scheme.OpenIdConnectSecuritySchemeTest From bcb6bc1c4145dc2759218763051359bff98f7b03 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:29:05 +0400 Subject: [PATCH 070/141] feat(schemas): move Json Schema to schemas package --- .../asyncapi/{v3/schema => schemas}/JsonSchema.java | 2 +- .../schema/JsonSchemaAnyValueDeserializer.java | 2 +- .../jackson/schema/JsonSchemaItemsDeserializer.java | 2 +- .../schema/JsonSchemaPropertiesDeserializer.java | 2 +- .../v3/schema/multiformat/JsonFormatSchema.java | 2 +- .../examples/v3/_0_0/GitterStreamingAsyncAPI.kt | 2 +- .../v3/_0_0/model/component/ComponentsTest.kt | 2 +- .../com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt | 1 + .../com/asyncapi/v3/schema/ReadJsonSchemaTest.kt | 1 + .../kotlin/com/asyncapi/v3/schema/SchemaProvider.kt | 4 +++- .../com/asyncapi/v3/schema/json/ArraysSchemaTest.kt | 2 +- .../com/asyncapi/v3/schema/json/ComplexObjectTest.kt | 2 +- .../v3/schema/json/ConditionalValidationIfElse.kt | 11 +++++++---- .../v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt | 5 +++-- .../asyncapi/v3/schema/json/EnumeratedValuesTest.kt | 2 +- .../kotlin/com/asyncapi/v3/schema/json/PersonTest.kt | 2 +- .../com/asyncapi/v3/schema/json/RegexPatternTest.kt | 2 +- .../json/properties/ConstDefaultExamplesArrayTest.kt | 2 +- .../ConstDefaultExamplesBigDecimalMaximumTest.kt | 2 +- .../ConstDefaultExamplesBigDecimalMinimumTest.kt | 2 +- .../properties/ConstDefaultExamplesBigDecimalTest.kt | 2 +- .../ConstDefaultExamplesBigIntegerMaximumTest.kt | 2 +- .../ConstDefaultExamplesBigIntegerMinimumTest.kt | 2 +- .../properties/ConstDefaultExamplesBigIntegerTest.kt | 2 +- .../ConstDefaultExamplesBooleanFalseTest.kt | 2 +- .../properties/ConstDefaultExamplesBooleanTrueTest.kt | 2 +- .../ConstDefaultExamplesDoubleMaximumTest.kt | 2 +- .../ConstDefaultExamplesDoubleMinimumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesDoubleTest.kt | 2 +- .../properties/ConstDefaultExamplesIntMaximumTest.kt | 2 +- .../properties/ConstDefaultExamplesIntMinimumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesIntTest.kt | 2 +- .../json/properties/ConstDefaultExamplesNullTest.kt | 2 +- .../json/properties/ConstDefaultExamplesObjectTest.kt | 2 +- 34 files changed, 44 insertions(+), 36 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/JsonSchema.java (99%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/JsonSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java similarity index 99% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/JsonSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java index 71eba2b0..f7e85865 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/JsonSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema; +package com.asyncapi.schemas; import com.asyncapi.v3.jackson.schema.JsonSchemaAnyValueDeserializer; import com.asyncapi.v3.jackson.schema.JsonSchemaItemsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java index bc0d5e48..20176a57 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.jackson.schema; -import com.asyncapi.v3.schema.JsonSchema; +import com.asyncapi.schemas.JsonSchema; /** * Json Schema any value deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java index 2ec9c9f5..c9f2184e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.jackson.schema; import com.asyncapi.v3.jackson.SchemaItemsDeserializer; -import com.asyncapi.v3.schema.JsonSchema; +import com.asyncapi.schemas.JsonSchema; /** * Json Schema items deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java index 73830158..b83baeff 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.jackson.schema; -import com.asyncapi.v3.schema.JsonSchema; +import com.asyncapi.schemas.JsonSchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java index 8165167f..b3ccd405 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat; import com.asyncapi.v3.schema.AsyncAPISchema; -import com.asyncapi.v3.schema.JsonSchema; +import com.asyncapi.schemas.JsonSchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index d11af45a..e837d354 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -13,7 +13,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.multiformat.JsonFormatSchema import com.asyncapi.v3.security_scheme.http.HttpSecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt index a8ac0da4..f51c215d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyTestWithReferenc import com.asyncapi.v3._0_0.model.server.ServerTest import com.asyncapi.v3._0_0.model.server.ServerVariableTest import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.Type import com.asyncapi.v3.schema.multiformat.JsonFormatSchema import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt index 33127806..a1f84f31 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.schema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.ClasspathUtils import com.asyncapi.v3.schema.json.properties.* import com.fasterxml.jackson.annotation.JsonInclude diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt index 5946e7b2..7c223725 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.schema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.ClasspathUtils import com.asyncapi.v3.schema.json.* import com.fasterxml.jackson.annotation.JsonInclude diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt index 1174ee68..9dd4a710 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt @@ -1,12 +1,14 @@ package com.asyncapi.v3.schema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema import com.asyncapi.v3.schema.multiformat.JsonFormatSchema import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema interface SchemaProvider { - fun jsonSchema(): JsonSchema = JsonSchema() + fun jsonSchema(): JsonSchema = + JsonSchema() fun jsonFormatSchemaJson(): JsonFormatSchema = JsonFormatSchema(jsonSchema()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt index f2becc41..6fc5dd93 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ArraysSchemaTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt index cfe8b7ac..61a7c1c8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt index c4e423bf..edbab2cf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConditionalValidationIfElse: SchemaProvider { @@ -23,7 +23,8 @@ class ConditionalValidationIfElse: SchemaProvider { ) )) .required(listOf("isMember")) - .ifValue(JsonSchema.builder() + .ifValue( + JsonSchema.builder() .properties(mapOf( Pair("isMember", JsonSchema.builder() .constValue(true) @@ -32,7 +33,8 @@ class ConditionalValidationIfElse: SchemaProvider { )) .build() ) - .thenValue(JsonSchema.builder() + .thenValue( + JsonSchema.builder() .properties(mapOf( Pair("membershipNumber", JsonSchema.builder() .type("string") @@ -43,7 +45,8 @@ class ConditionalValidationIfElse: SchemaProvider { )) .build() ) - .elseValue(JsonSchema.builder() + .elseValue( + JsonSchema.builder() .properties(mapOf( Pair("membershipNumber", JsonSchema.builder() .type("string") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt index 9906c4d3..fd0a18c1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal @@ -196,7 +196,8 @@ class Draft07CoreSchemaMetaSchemaTest: SchemaProvider { ), Pair("dependencies", JsonSchema.builder() .type("object") - .additionalProperties(JsonSchema.builder().anyOf(listOf( + .additionalProperties( + JsonSchema.builder().anyOf(listOf( JsonSchema.builder().ref("#").build(), JsonSchema.builder().ref("#/definitions/stringArray").build(), )).build()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt index f9af8303..9a5fdb57 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class EnumeratedValuesTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt index 63f25de1..34d12db8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt index 4334d690..0203ffcb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class RegexPatternTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt index 064164bc..ec40a7b8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesArrayTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt index cb6af518..fe07eeef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt index 5a7c7446..696e46b3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt index e3ce747c..22866eb7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt index deeebe36..7b542fb8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt index dcffc9bd..85bf9e5e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt index 2ca5695b..d0f60c67 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt index 099ee50d..56ccaaef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesBooleanFalseTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt index bdd98dc2..9392fb0d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesBooleanTrueTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt index 7968adbd..7902e7c3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesDoubleMaximumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt index e4d0420e..b660b5d0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesDoubleMinimumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt index 1c887d63..4559021e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesDoubleTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt index 02d07659..abb8ce24 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesIntMaximumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt index e3cfeea5..69c4f534 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesIntMinimumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt index d6e677e9..7e6faaab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesIntTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt index ff007981..2a383f37 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesNullTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt index 56e24799..7ea144b6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.json.properties import com.asyncapi.v3.schema.AsyncAPISchema -import com.asyncapi.v3.schema.JsonSchema +import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider class ConstDefaultExamplesObjectTest: SchemaProvider { From 8914c1c8e49d960fbbaa27c6dc9dc7fd9cd57cc0 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:38:16 +0400 Subject: [PATCH 071/141] feat(schemas): move AsyncAPI Schema to schemas package --- .../message/AnypointMQMessageBinding.java | 2 +- .../v0/_1_0/message/HTTPMessageBinding.java | 2 +- .../_1_0/operation/HTTPOperationBinding.java | 2 +- .../v0/_2_0/message/HTTPMessageBinding.java | 2 +- .../_2_0/operation/HTTPOperationBinding.java | 3 +- .../v0/_3_0/message/HTTPMessageBinding.java | 2 +- .../_3_0/operation/HTTPOperationBinding.java | 2 +- .../v0/_0_1/message/JMSMessageBinding.java | 2 +- .../v0/_4_0/message/KafkaMessageBinding.java | 2 +- .../_4_0/operation/KafkaOperationBinding.java | 2 +- .../channel/WebSocketsChannelBinding.java | 2 +- .../schema => schemas}/AsyncAPISchema.java | 3 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessagePayloadDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 2 +- .../_0_0/model/channel/message/Message.java | 9 +- .../model/channel/message/MessageTrait.java | 5 +- .../v3/_0_0/model/component/Components.java | 2 +- ...chemaAdditionalPropertiesDeserializer.java | 2 +- .../AsyncAPISchemaAnyValueDeserializer.java | 2 +- .../AsyncAPISchemaItemsDeserializer.java | 13 +- .../multiformat/AsyncAPIFormatSchema.java | 2 +- .../schema/multiformat/AvroFormatSchema.java | 2 +- .../schema/multiformat/JsonFormatSchema.java | 2 +- .../schema/multiformat/MultiFormatSchema.java | 2 +- .../multiformat/OpenAPIFormatSchema.java | 2 +- .../anypointmq/AnypointMQV0_0_1Test.java | 2 +- .../bindings/http/HTTPV0_1_0Test.java | 2 +- .../bindings/http/HTTPV0_2_0Test.java | 2 +- .../bindings/http/HTTPV0_3_0Test.java | 2 +- .../asyncapi/bindings/jms/JMSV0_1_0Test.java | 3 +- .../bindings/kafka/KafkaV0_4_0Test.java | 2 +- .../websockets/WebSocketsV0_1_0Test.java | 2 +- .../examples/v2/_0_0/GitterStreaming.kt | 8 +- .../examples/v2/_0_0/StreetlightsKafka.kt | 5 +- .../v2/_0_0/StreetlightsOperationSecurity.kt | 5 +- .../examples/v2/_0_0/WebsocketGemini.kt | 2 +- .../examples/v2/_6_0/GitterStreaming.kt | 5 +- .../examples/v2/_6_0/StreetlightsKafka.kt | 5 +- .../v2/_6_0/StreetlightsOperationSecurity.kt | 5 +- .../examples/v2/_6_0/WebsocketGemini.kt | 2 +- .../v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt | 11 +- .../examples/v3/_0_0/AnyOfAsyncAPI.kt | 5 +- .../v3/_0_0/ApplicationHeadersAsyncAPI.kt | 5 +- .../examples/v3/_0_0/CorrelationIdAsyncAPI.kt | 2 +- .../v3/_0_0/GitterStreamingAsyncAPI.kt | 8 +- ...equestReplyMessageFilterInReplyAsyncAPI.kt | 8 +- ...ketRequestReplyMultipleChannelsAsyncAPI.kt | 8 +- .../examples/v3/_0_0/MercureAsyncAPI.kt | 5 +- .../asyncapi/examples/v3/_0_0/NotAsyncAPI.kt | 2 +- .../examples/v3/_0_0/OneOfAsyncAPI.kt | 5 +- .../v3/_0_0/OperationSecurityAsyncAPI.kt | 8 +- .../examples/v3/_0_0/RpcClientAsyncAPI.kt | 11 +- .../examples/v3/_0_0/RpcServerAsyncAPI.kt | 11 +- .../examples/v3/_0_0/SimpleAsyncAPI.kt | 5 +- .../examples/v3/_0_0/SlackRtmAsyncAPI.kt | 157 ++++++++++++------ .../v3/_0_0/StreetlightsKafkaAsyncAPI.kt | 8 +- .../v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 5 +- .../StreetlightsOperationSecurityAsyncAPI.kt | 8 +- .../v3/_0_0/WebsocketGeminiAsyncAPI.kt | 5 +- .../_0_0/model/channel/message/MessageTest.kt | 8 +- .../model/channel/message/MessageTraitTest.kt | 5 +- .../message/MessageWithArrayPayloadTest.kt | 2 +- .../v3/_0_0/model/component/ComponentsTest.kt | 2 +- .../v3/schema/ReadJsonPropertiesTest.kt | 1 + .../asyncapi/v3/schema/ReadJsonSchemaTest.kt | 1 + .../com/asyncapi/v3/schema/SchemaProvider.kt | 4 +- .../v3/schema/json/ArraysSchemaTest.kt | 2 +- .../v3/schema/json/ComplexObjectTest.kt | 2 +- .../json/ConditionalValidationIfElse.kt | 11 +- .../json/Draft07CoreSchemaMetaSchemaTest.kt | 5 +- .../v3/schema/json/EnumeratedValuesTest.kt | 2 +- .../com/asyncapi/v3/schema/json/PersonTest.kt | 2 +- .../v3/schema/json/RegexPatternTest.kt | 2 +- .../ConstDefaultExamplesArrayTest.kt | 2 +- ...nstDefaultExamplesBigDecimalMaximumTest.kt | 2 +- ...nstDefaultExamplesBigDecimalMinimumTest.kt | 2 +- .../ConstDefaultExamplesBigDecimalTest.kt | 2 +- ...nstDefaultExamplesBigIntegerMaximumTest.kt | 2 +- ...nstDefaultExamplesBigIntegerMinimumTest.kt | 2 +- .../ConstDefaultExamplesBigIntegerTest.kt | 2 +- .../ConstDefaultExamplesBooleanFalseTest.kt | 2 +- .../ConstDefaultExamplesBooleanTrueTest.kt | 2 +- .../ConstDefaultExamplesDoubleMaximumTest.kt | 2 +- .../ConstDefaultExamplesDoubleMinimumTest.kt | 2 +- .../ConstDefaultExamplesDoubleTest.kt | 2 +- .../ConstDefaultExamplesIntMaximumTest.kt | 2 +- .../ConstDefaultExamplesIntMinimumTest.kt | 2 +- .../properties/ConstDefaultExamplesIntTest.kt | 2 +- .../ConstDefaultExamplesNullTest.kt | 2 +- .../ConstDefaultExamplesObjectTest.kt | 2 +- 91 files changed, 287 insertions(+), 200 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/AsyncAPISchema.java (99%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java index fed9ac8e..dde6a375 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.anypointmq.v0._0_1.message; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java index 2c70c786..5e1091ea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._1_0.message; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java index b8357de5..b976702a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._1_0.operation; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java index 3b104932..4aefe413 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._2_0.message; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java index 2ed6ff70..2331a6b6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java @@ -1,10 +1,9 @@ package com.asyncapi.bindings.http.v0._2_0.operation; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java index 1ec45d80..29c0f983 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._3_0.message; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java index 834a4d51..425c4f09 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._3_0.operation; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java index c9b55651..13f87827 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.jms.v0._0_1.message; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java index 5e2b22ad..87218cd8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.kafka.v0._4_0.message; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java index c2a91203..8d9331eb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.kafka.v0._4_0.operation; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java index 4f74941e..b2e56c43 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.websockets.v0._1_0.channel; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java similarity index 99% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java index ff436c7c..8fe9436a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/AsyncAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java @@ -1,6 +1,5 @@ -package com.asyncapi.v3.schema; +package com.asyncapi.schemas; -import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAdditionalPropertiesDeserializer; import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAnyValueDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 7e8ac883..77622986 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; import com.asyncapi.schemas.Reference; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java index 0cef09a5..8b0770fc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index 01491e41..619a6f6b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java index 41539cf8..ee3d515e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java @@ -1,5 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; @@ -40,13 +41,13 @@ public class Message extends ExtendableObject { *

* It MUST NOT define the protocol headers. *

- * If this is a {@link com.asyncapi.v3.schema.AsyncAPISchema}, then the schemaFormat will be assumed to + * If this is a {@link AsyncAPISchema}, then the schemaFormat will be assumed to * be "application/vnd.aai.asyncapi+json;version=asyncapi" where the version * is equal to the AsyncAPI Version String. *

* MUST BE: *

    - *
  • {@link com.asyncapi.v3.schema.AsyncAPISchema}
    • + *
  • {@link AsyncAPISchema}
    • *
  • {@link MultiFormatSchema}
    • *
  • {@link Reference}
    • *
@@ -58,12 +59,12 @@ public class Message extends ExtendableObject { /** * Definition of the message payload. *

- * If this is a {@link com.asyncapi.v3.schema.AsyncAPISchema}, then the schemaFormat will be assumed to be + * If this is a {@link AsyncAPISchema}, then the schemaFormat will be assumed to be * "application/vnd.aai.asyncapi+json;version=asyncapi" where the version is equal to the AsyncAPI Version String. *

* MUST BE: *

    - *
  • {@link com.asyncapi.v3.schema.AsyncAPISchema}
    • + *
  • {@link AsyncAPISchema}
    • *
  • {@link MultiFormatSchema}
    • *
  • {@link Reference}
    • *
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java index d16dcf5e..7ae8dd83 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java @@ -1,5 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.schemas.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; @@ -40,13 +41,13 @@ public class MessageTrait extends ExtendableObject { *

* It MUST NOT define the protocol headers. *

- * If this is a {@link com.asyncapi.v3.schema.AsyncAPISchema}, then the schemaFormat will be assumed to + * If this is a {@link AsyncAPISchema}, then the schemaFormat will be assumed to * be "application/vnd.aai.asyncapi+json;version=asyncapi" where the version * is equal to the AsyncAPI Version String. *

* MUST BE: *

    - *
  • {@link com.asyncapi.v3.schema.AsyncAPISchema}
    • + *
  • {@link AsyncAPISchema}
    • *
  • {@link MultiFormatSchema}
    • *
  • {@link Reference}
    • *
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index 14f94811..6672e417 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -24,7 +24,7 @@ import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.bindings.ServerBindingsDeserializer; import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v3.security_scheme.SecurityScheme; import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java index 87e2e636..1932c96b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.jackson.schema; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java index d64884d0..8fe6962c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.jackson.schema; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; /** * AsyncAPI Schema any value deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java index 2bad7eb6..479da820 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java @@ -1,18 +1,7 @@ package com.asyncapi.v3.jackson.schema; import com.asyncapi.v3.jackson.SchemaItemsDeserializer; -import com.asyncapi.v3.schema.AsyncAPISchema; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeType; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import com.asyncapi.schemas.AsyncAPISchema; /** * AsyncAPI Schema items deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AsyncAPIFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AsyncAPIFormatSchema.java index cb3fdb15..88fbb793 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AsyncAPIFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AsyncAPIFormatSchema.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java index db9244ea..c60b665d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat; import com.asyncapi.schemas.Reference; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v3.schema.avro.v1._9_0.jackson.AvroSchemaDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java index b3ccd405..0b501822 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.JsonSchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java index a136fab4..6093ee9c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.schemas.Reference; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/OpenAPIFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/OpenAPIFormatSchema.java index 3f1f4bc9..8af5f060 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/OpenAPIFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/OpenAPIFormatSchema.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java index 579ae5ff..b0467cf5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java index 591a373d..14e16b76 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod; import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType; import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java index ff29d6ee..43d4534e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.http.v0._2_0.operation.HTTPOperationBinding; import com.asyncapi.bindings.http.v0._2_0.operation.HTTPOperationMethod; import com.asyncapi.bindings.http.v0._2_0.server.HTTPServerBinding; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java index 70d79aae..af600d4d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding; import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod; import com.asyncapi.bindings.http.v0._3_0.server.HTTPServerBinding; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java index 257c52f5..0b658bca 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java @@ -7,13 +7,12 @@ import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerProperty; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; @DisplayName("0.0.1") public class JMSV0_1_0Test { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java index 2eeb41fe..634bb61c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java @@ -8,7 +8,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageSchemaIdLocation; import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java index c4b7e3ab..04881665 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; -import com.asyncapi.v3.schema.AsyncAPISchema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt index 85de783e..2b56c430 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class GitterStreaming: AbstractExampleValidationTest() { @@ -247,7 +247,8 @@ class GitterStreaming: AbstractExampleValidationTest() { ) .bindings(mapOf( Pair("http", HTTPMessageBinding.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("Transfer-Encoding", AsyncAPISchema.builder() @@ -277,7 +278,8 @@ class GitterStreaming: AbstractExampleValidationTest() { ) .bindings(mapOf( Pair("http", HTTPMessageBinding.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("Transfer-Encoding", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt index 02f516b3..d90dd427 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt @@ -14,7 +14,7 @@ import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.SecurityScheme -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -253,7 +253,8 @@ class StreetlightsKafka: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(AsyncAPISchema.builder() + .clientId( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt index 11ee7fa4..f064e10b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt @@ -17,7 +17,7 @@ import com.asyncapi.v2.security_scheme.SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -273,7 +273,8 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(AsyncAPISchema.builder() + .clientId( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt index 26138b76..bb75e7e1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt @@ -11,7 +11,7 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding import com.asyncapi.v2.schema.Schema -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class WebsocketGemini: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt index 7725bf89..321a6d3e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class GitterStreaming: AbstractExampleValidationTest() { @@ -273,7 +273,8 @@ class GitterStreaming: AbstractExampleValidationTest() { )) .messageBindings(mapOf( Pair("http", HTTPMessageBinding.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("Transfer-Encoding", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt index fa2682f9..0503d046 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt @@ -15,7 +15,7 @@ import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.v2.schema.Schema import com.asyncapi.v2.security_scheme.SecurityScheme -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -282,7 +282,8 @@ class StreetlightsKafka: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(AsyncAPISchema.builder() + .clientId( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt index d916296a..26d996e0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt @@ -17,7 +17,7 @@ import com.asyncapi.v2.security_scheme.SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -280,7 +280,8 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(AsyncAPISchema.builder() + .clientId( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt index 08dfb977..087970af 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt @@ -12,7 +12,7 @@ import com.asyncapi.v2._6_0.model.info.Contact import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding import com.asyncapi.v2.schema.Schema -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class WebsocketGemini: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt index 97feab1c..13587cdf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt @@ -19,7 +19,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicCleanupPolic import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguration import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v3.schema.multiformat.AvroFormatSchema import com.asyncapi.v3.security_scheme.SecurityScheme @@ -176,7 +176,8 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { override fun expectedOperations(): Map { val receiveACostingRequestKafkaBinding = KafkaOperationBinding.builder() - .groupId(AsyncAPISchema.builder() + .groupId( + AsyncAPISchema.builder() .type("string") .description("The groupId must be prefixed by your `svc` account, deliver by the Adeo Kafka team. This `svc` must have the write access to the topic.\n") .build() @@ -246,7 +247,8 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { Tag.builder().name("costing").build() )) .correlationId(Reference("#/components/correlationIds/costingCorrelationId")) - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .required(listOf( "REQUESTER_ID", "REQUESTER_CODE", "REQUEST_ID", "REPLY_TOPIC" @@ -275,7 +277,8 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { Tag.builder().name("costing").build() )) .correlationId(Reference("#/components/correlationIds/costingCorrelationId")) - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("CALCULATION_ID", AsyncAPISchema.builder().ref("#/components/schemas/MessageId").build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt index df43b504..979cf96a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt @@ -7,7 +7,7 @@ import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class AnyOfAsyncAPI: AbstractExampleValidationTest() { override fun specificationLocation(): String = "/examples/v3.0.0/anyof-asyncapi.yml" @@ -53,7 +53,8 @@ class AnyOfAsyncAPI: AbstractExampleValidationTest() { .messages(mapOf( Pair("testMessages", Message.builder() - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .anyOf(listOf( AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt index 0b54fb37..568a2d36 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt @@ -12,7 +12,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import java.math.BigDecimal class ApplicationHeadersAsyncAPI: AbstractExampleValidationTest() { @@ -99,7 +99,8 @@ class ApplicationHeadersAsyncAPI: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .correlationId(CorrelationId(null, "\$message.header#/MQMD/CorrelId")) .contentType("application/json") - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("MQMD", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt index 4f5c2f68..db10383c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt @@ -13,7 +13,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v3.security_scheme.OpenIdConnectSecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index e837d354..e9cbdcc5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -12,7 +12,7 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.multiformat.JsonFormatSchema import com.asyncapi.v3.security_scheme.http.HttpSecurityScheme @@ -260,7 +260,8 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { )) .bindings(mapOf( Pair("http", HTTPMessageBinding.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("Transfer-Encoding", AsyncAPISchema.builder() @@ -292,7 +293,8 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { )) .bindings(mapOf( Pair("http", HTTPMessageBinding.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("Transfer-Encoding", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt index 8125cf0b..6f828882 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.reply.OperationReply -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleValidationTest() { @@ -136,7 +136,8 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa Pair("dummyCurrencyInfo", Message.builder() .summary("Dummy message with no real life details") .description("It is here in this example to showcase that there is an additional message that normally is of a complex structure. It represents actually currency exchange value to show a reply to operation receiveSubscribeRequest with more than one possible message.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("event", AsyncAPISchema.builder() @@ -530,7 +531,8 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa Pair("pair", AsyncAPISchema.builder() .type("array") .description("Array of currency pairs.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("string") .description("Format of each pair is \"A/B\", where A and B are ISO 4217-A3 for standardized assets and popular unique symbol if not standardized.") .pattern("[A-Z\\s]+\\/[A-Z\\s]+") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt index 2ce02506..89f133aa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.reply.OperationReply -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValidationTest() { @@ -168,7 +168,8 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida Pair("dummyCurrencyInfo", Message.builder() .summary("Dummy message with no real life details") .description("It is here in this example to showcase that there is an additional message that normally is of a complex structure. It represents actually currency exchange value to show a reply to operation receiveSubscribeRequest with more than one possible message.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("event", AsyncAPISchema.builder() @@ -562,7 +563,8 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida Pair("pair", AsyncAPISchema.builder() .type("array") .description("Array of currency pairs.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("string") .description("Format of each pair is \"A/B\", where A and B are ISO 4217-A3 for standardized assets and popular unique symbol if not standardized.") .pattern("[A-Z\\s]+\\/[A-Z\\s]+") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt index a7ed696f..363e8151 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class MercureAsyncAPI: AbstractExampleValidationTest() { @@ -91,7 +91,8 @@ class MercureAsyncAPI: AbstractExampleValidationTest() { Message.builder() .summary("The content of a book resource.") .externalDocs(ExternalDocumentation(null, "https://schema.org/Book")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("@id", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt index 394c5065..5faf9053 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt @@ -7,7 +7,7 @@ import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class NotAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt index b2adc39c..797d4331 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt @@ -7,7 +7,7 @@ import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class OneOfAsyncAPI: AbstractExampleValidationTest() { @@ -81,7 +81,8 @@ class OneOfAsyncAPI: AbstractExampleValidationTest() { .messages(mapOf( Pair("testMessages", Message.builder() - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .oneOf(listOf( AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt index 7fa021c7..a45c1446 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt @@ -9,7 +9,7 @@ import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows import com.asyncapi.v3.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow @@ -85,7 +85,8 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { .messages(mapOf( Pair("message", Message.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("X-SIGNATURE", AsyncAPISchema.builder() @@ -102,7 +103,8 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { ) )) .build()) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("metadata", AsyncAPISchema.builder().ref("#/components/schemas/MetaData").build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt index 2a0778bb..707e1b6a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt @@ -14,7 +14,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class RpcClientAsyncAPI: AbstractExampleValidationTest() { @@ -51,7 +51,8 @@ class RpcClientAsyncAPI: AbstractExampleValidationTest() { Pair("receiveSumResult", Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("result", AsyncAPISchema.builder() @@ -88,12 +89,14 @@ class RpcClientAsyncAPI: AbstractExampleValidationTest() { Pair("requestSum", Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("numbers", AsyncAPISchema.builder() .type("array") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("number") .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt index b192a395..f3c7cfa7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt @@ -14,7 +14,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class RpcServerAsyncAPI: AbstractExampleValidationTest() { @@ -51,7 +51,8 @@ class RpcServerAsyncAPI: AbstractExampleValidationTest() { Pair("sendSumResult", Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("result", AsyncAPISchema.builder() @@ -88,12 +89,14 @@ class RpcServerAsyncAPI: AbstractExampleValidationTest() { Pair("sum", Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("numbers", AsyncAPISchema.builder() .type("array") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("number") .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt index 2be505db..d55b0d5d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt @@ -7,7 +7,7 @@ import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class SimpleAsyncAPI: AbstractExampleValidationTest() { @@ -57,7 +57,8 @@ class SimpleAsyncAPI: AbstractExampleValidationTest() { .messages(mapOf( Pair("UserSignedUp", Message.builder() - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("displayName", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt index 60cf27cc..44b58f02 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt @@ -8,7 +8,7 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v3.security_scheme.http.HttpApiKeySecurityScheme class SlackRtmAsyncAPI: AbstractExampleValidationTest() { @@ -316,7 +316,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { ), Pair("fields", AsyncAPISchema.builder() .type("array") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("title", AsyncAPISchema.builder() @@ -367,7 +368,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("hello", Message.builder() .summary("First event received upon connection.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -383,7 +385,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("connectionError", Message.builder() .summary("Event received when a connection error happens.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -407,7 +410,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("accountsChanged", Message.builder() .summary("The list of accounts a user is signed into has changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -423,7 +427,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("botAdded", Message.builder() .summary("A bot user was added.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -462,7 +467,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("botChanged", Message.builder() .summary("A bot user was changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -501,7 +507,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("channelArchive", Message.builder() .summary("A channel was archived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -525,7 +532,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("channelCreated", Message.builder() .summary("A channel was created.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -563,7 +571,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("channelDeleted", Message.builder() .summary("A channel was deleted.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -583,7 +592,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("channelHistoryChanged", Message.builder() .summary("Bulk updates were made to a channel's history.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -611,7 +621,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("channelJoined", Message.builder() .summary("You joined a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -649,7 +660,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("channelLeft", Message.builder() .summary("You left a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -669,7 +681,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("channelMarked", Message.builder() .summary("Your channel read marker was updated.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -693,7 +706,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("channelRename", Message.builder() .summary("A channel was renamed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -727,7 +741,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("channelUnarchive", Message.builder() .summary("A channel was unarchived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -751,7 +766,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("commandsChanged", Message.builder() .summary("A slash command has been added or changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -771,7 +787,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("dndUpdated", Message.builder() .summary("Do not Disturb settings changed for the current user.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -817,7 +834,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("dndUpdatedUser", Message.builder() .summary("Do not Disturb settings changed for a member.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -855,7 +873,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("emailDomainChanged", Message.builder() .summary("The workspace email domain has changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -879,7 +898,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("emojiRemoved", Message.builder() .summary("A custom emoji has been removed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -909,7 +929,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("emojiAdded", Message.builder() .summary("A custom emoji has been added.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -943,7 +964,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("fileChange", Message.builder() .summary("A file was changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -970,7 +992,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("fileCommentAdded", Message.builder() .summary("A file comment was added.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -978,7 +1001,9 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { .enumValue(listOf("file_comment_added")) .build() ), - Pair("comment", AsyncAPISchema()), + Pair("comment", + AsyncAPISchema() + ), Pair("file_id", AsyncAPISchema.builder() .type("string") .build() @@ -998,7 +1023,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("fileCommentDeleted", Message.builder() .summary("A file comment was deleted.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1029,7 +1055,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("fileCommentEdited", Message.builder() .summary("A file comment was edited.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1037,7 +1064,9 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { .enumValue(listOf("file_comment_edited")) .build() ), - Pair("comment", AsyncAPISchema()), + Pair("comment", + AsyncAPISchema() + ), Pair("file_id", AsyncAPISchema.builder() .type("string") .build() @@ -1057,7 +1086,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("fileCreated", Message.builder() .summary("A file was created.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1084,7 +1114,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("fileDeleted", Message.builder() .summary("A file was deleted.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1108,7 +1139,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("filePublic", Message.builder() .summary("A file was made public.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1135,7 +1167,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("fileShared", Message.builder() .summary("A file was shared.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1162,7 +1195,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("fileUnshared", Message.builder() .summary("A file was unshared.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1189,7 +1223,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("goodbye", Message.builder() .summary("The server intends to close the connection soon.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1205,7 +1240,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("groupArchive", Message.builder() .summary("A private channel was archived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1225,7 +1261,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("groupClose", Message.builder() .summary("You closed a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1249,7 +1286,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("groupHistoryChanged", Message.builder() .summary("Bulk updates were made to a private channel's history.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1277,7 +1315,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("groupJoined", Message.builder() .summary("You joined a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1315,7 +1354,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("groupLeft", Message.builder() .summary("You left a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1335,7 +1375,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("groupMarked", Message.builder() .summary("A private channel read marker was updated.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1359,7 +1400,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("groupOpen", Message.builder() .summary("You opened a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1383,7 +1425,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("groupRename", Message.builder() .summary("A private channel was renamed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1417,7 +1460,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("groupUnarchive", Message.builder() .summary("A private channel was unarchived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1441,7 +1485,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("imClose", Message.builder() .summary("You closed a DM.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1465,7 +1510,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("imCreated", Message.builder() .summary("A DM was created.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1507,7 +1553,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("imMarked", Message.builder() .summary("A direct message read marker was updated.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1531,7 +1578,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("imOpen", Message.builder() .summary("You opened a DM.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1555,7 +1603,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("manualPresenceChange", Message.builder() .summary("You manually updated your presence.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1575,7 +1624,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("memberJoinedChannel", Message.builder() .summary("A user joined a public or private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1612,7 +1662,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("memberLeftChannel", Message.builder() .summary("A user left a public or private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1645,7 +1696,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("message", Message.builder() .summary("A message was sent to a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1696,7 +1748,8 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { Pair("outgoingMessage", Message.builder() .summary("A message was sent to a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt index fb673986..c3cf4ea1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt @@ -14,7 +14,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v3.security_scheme.SecurityScheme import java.math.BigDecimal @@ -291,7 +291,8 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("my-app-header", AsyncAPISchema.builder() @@ -311,7 +312,8 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(AsyncAPISchema.builder() + .clientId( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index 7c85e601..0cb03557 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -17,7 +17,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows import com.asyncapi.v3.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow @@ -371,7 +371,8 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("my-app-header", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt index c5b1c17a..e8a75e89 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt @@ -13,7 +13,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v3.security_scheme.SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows @@ -320,7 +320,8 @@ class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("my-app-header", AsyncAPISchema.builder() @@ -340,7 +341,8 @@ class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { OperationTrait.builder() .bindings(mapOf( Pair("kafka", KafkaOperationBinding.builder() - .clientId(AsyncAPISchema.builder() + .clientId( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("my-app-id")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt index 96d2d059..6ca411dc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt @@ -13,7 +13,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema class WebsocketGeminiAsyncAPI: AbstractExampleValidationTest() { @@ -360,7 +360,8 @@ class WebsocketGeminiAsyncAPI: AbstractExampleValidationTest() { Pair("events", AsyncAPISchema.builder() .type("array") .description("Either a change to the order book, or the indication that a trade has occurred.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .additionalProperties(false) .properties(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 3c70a9b6..7176da8d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema class MessageTestWithSchema: SerDeTest() { @@ -26,7 +26,8 @@ class MessageTestWithSchema: SerDeTest() { override fun build(): Message { return Message.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( @@ -46,7 +47,8 @@ class MessageTestWithSchema: SerDeTest() { )) .build() ) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 8aba7af7..31014732 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test @@ -26,7 +26,8 @@ class MessageTraitTestWithSchema: SerDeTest() { override fun build(): MessageTrait { return MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageWithArrayPayloadTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageWithArrayPayloadTest.kt index f82d84c2..f4a67f95 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageWithArrayPayloadTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageWithArrayPayloadTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.channel.message import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt index f51c215d..637d6611 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyTest import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyTestWithReference import com.asyncapi.v3._0_0.model.server.ServerTest import com.asyncapi.v3._0_0.model.server.ServerVariableTest -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.Type import com.asyncapi.v3.schema.multiformat.JsonFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt index a1f84f31..164ae874 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.ClasspathUtils import com.asyncapi.v3.schema.json.properties.* diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt index 7c223725..0c5ade39 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.ClasspathUtils import com.asyncapi.v3.schema.json.* diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt index 9dd4a710..38845370 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema import com.asyncapi.v3.schema.multiformat.JsonFormatSchema @@ -14,7 +15,8 @@ interface SchemaProvider { fun jsonFormatSchemaYaml(): JsonFormatSchema = JsonFormatSchema("application/schema+yaml;version=draft-07", jsonSchema()) - fun asyncAPISchema(): AsyncAPISchema = AsyncAPISchema() + fun asyncAPISchema(): AsyncAPISchema = + AsyncAPISchema() fun asyncAPIFormatSchemaEmptySchemaFormat(): AsyncAPIFormatSchema = AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", asyncAPISchema()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt index 6fc5dd93..4d40e881 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt index 61a7c1c8..c856a8a5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt index edbab2cf..883e71a5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider @@ -76,7 +76,8 @@ class ConditionalValidationIfElse: SchemaProvider { ) )) .required(listOf("isMember")) - .ifValue(AsyncAPISchema.builder() + .ifValue( + AsyncAPISchema.builder() .properties(mapOf( Pair("isMember", AsyncAPISchema.builder() .constValue(true) @@ -85,7 +86,8 @@ class ConditionalValidationIfElse: SchemaProvider { )) .build() ) - .thenValue(AsyncAPISchema.builder() + .thenValue( + AsyncAPISchema.builder() .properties(mapOf( Pair("membershipNumber", AsyncAPISchema.builder() .type("string") @@ -96,7 +98,8 @@ class ConditionalValidationIfElse: SchemaProvider { )) .build() ) - .elseValue(AsyncAPISchema.builder() + .elseValue( + AsyncAPISchema.builder() .properties(mapOf( Pair("membershipNumber", AsyncAPISchema.builder() .type("string") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt index fd0a18c1..8851027d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal @@ -458,7 +458,8 @@ class Draft07CoreSchemaMetaSchemaTest: SchemaProvider { ), Pair("dependencies", AsyncAPISchema.builder() .type("object") - .additionalProperties(AsyncAPISchema.builder().anyOf(listOf( + .additionalProperties( + AsyncAPISchema.builder().anyOf(listOf( AsyncAPISchema.builder().ref("#").build(), AsyncAPISchema.builder().ref("#/definitions/stringArray").build(), )).build()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt index 9a5fdb57..1c040c7f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt index 34d12db8..1195b291 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt index 0203ffcb..919c9647 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt index ec40a7b8..a5fe5d89 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt index fe07eeef..d0c61702 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt index 696e46b3..afae4292 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt index 22866eb7..9ff78c61 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt index 7b542fb8..afe55aab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt index 85bf9e5e..06756650 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt index d0f60c67..d4ee66ef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt index 56ccaaef..1d9270b7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt index 9392fb0d..bc800129 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt index 7902e7c3..53cedb0b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt index b660b5d0..45f9649a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt index 4559021e..16fe78dc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt index abb8ce24..8bf20632 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt index 69c4f534..bc00c0ac 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt index 7e6faaab..da12f320 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt index 2a383f37..1c51cd2e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt index 7ea144b6..8eb2fcfd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.json.properties -import com.asyncapi.v3.schema.AsyncAPISchema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.v3.schema.SchemaProvider From a8f9d613d27fce7ee7e9e5c980895e45d69f187d Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:42:05 +0400 Subject: [PATCH 072/141] feat(schemas): move Avro Schema to schemas package --- .../avro/v1/_9_0/AvroSchema.java | 2 +- .../avro/v1/_9_0/AvroSchemaArray.java | 4 +- .../avro/v1/_9_0/AvroSchemaEnum.java | 4 +- .../avro/v1/_9_0/AvroSchemaFixed.java | 2 +- .../avro/v1/_9_0/AvroSchemaLogicalType.java | 2 +- .../avro/v1/_9_0/AvroSchemaMap.java | 4 +- .../avro/v1/_9_0/AvroSchemaMetadata.java | 2 +- .../avro/v1/_9_0/AvroSchemaRecord.java | 2 +- .../avro/v1/_9_0/AvroSchemaRecordField.java | 4 +- .../avro/v1/_9_0/AvroSchemaType.java | 2 +- .../avro/v1/_9_0/AvroSchemaUnion.java | 4 +- .../_9_0/jackson/AvroSchemaDeserializer.java | 6 +- .../v1/_9_0/jackson/AvroTypeDeserializer.java | 6 +- .../schema/multiformat/AvroFormatSchema.java | 12 ++-- .../v3/schema/avro/AvroSchemasProvider.kt | 63 +++++++++++++------ .../com/asyncapi/v3/schema/avro/AvroTest.kt | 4 +- 16 files changed, 74 insertions(+), 49 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchema.java (99%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaArray.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaEnum.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaFixed.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaLogicalType.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaMap.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaMetadata.java (94%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaRecord.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaRecordField.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaType.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/AvroSchemaUnion.java (93%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java (93%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/avro/v1/_9_0/jackson/AvroTypeDeserializer.java (92%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchema.java similarity index 99% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchema.java index df2d7734..1f5b6607 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchema.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaArray.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaArray.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaArray.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaArray.java index 7adbf8c1..305d135f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaArray.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaArray.java @@ -1,6 +1,6 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.v3.schema.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaEnum.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaEnum.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaEnum.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaEnum.java index 965239d8..0a4d80f5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaEnum.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaEnum.java @@ -1,6 +1,6 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.v3.schema.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaFixed.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaFixed.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaFixed.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaFixed.java index 3ab8ba2c..5ea938ec 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaFixed.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaFixed.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaLogicalType.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaLogicalType.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaLogicalType.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaLogicalType.java index 78b72fcd..bfeebed6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaLogicalType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaLogicalType.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMap.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMap.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMap.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMap.java index 80d1c363..7439a0d6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMap.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMap.java @@ -1,6 +1,6 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.v3.schema.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMetadata.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMetadata.java similarity index 94% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMetadata.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMetadata.java index 52585f11..14dc038f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaMetadata.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMetadata.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaRecord.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecord.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaRecord.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecord.java index 684742e6..55d9e762 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaRecord.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecord.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaRecordField.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecordField.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaRecordField.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecordField.java index c07d97e0..658b0b8e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaRecordField.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecordField.java @@ -1,6 +1,6 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.v3.schema.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaType.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaType.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaType.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaType.java index 4b0f77a3..27bcb8a9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaType.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaUnion.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaUnion.java similarity index 93% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaUnion.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaUnion.java index 671a4645..5438133f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/AvroSchemaUnion.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaUnion.java @@ -1,6 +1,6 @@ -package com.asyncapi.v3.schema.avro.v1._9_0; +package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.v3.schema.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java similarity index 93% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java index 5e916b19..ac430be4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java @@ -1,8 +1,8 @@ -package com.asyncapi.v3.schema.avro.v1._9_0.jackson; +package com.asyncapi.schemas.avro.v1._9_0.jackson; import com.asyncapi.schemas.Reference; -import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchema; -import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaUnion; +import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; +import com.asyncapi.schemas.avro.v1._9_0.AvroSchemaUnion; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroTypeDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroTypeDeserializer.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroTypeDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroTypeDeserializer.java index 0673d418..e1de2721 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/v1/_9_0/jackson/AvroTypeDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroTypeDeserializer.java @@ -1,7 +1,7 @@ -package com.asyncapi.v3.schema.avro.v1._9_0.jackson; +package com.asyncapi.schemas.avro.v1._9_0.jackson; -import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchema; -import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaUnion; +import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; +import com.asyncapi.schemas.avro.v1._9_0.AvroSchemaUnion; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java index c60b665d..3620919d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java @@ -2,7 +2,9 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.v3.schema.avro.v1._9_0.jackson.AvroSchemaDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; +import com.asyncapi.schemas.avro.v1._9_0.AvroSchemaUnion; +import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroSchemaDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -37,8 +39,8 @@ public AvroFormatSchema( /** * Schema MUST be one of: *
    - *
  • {@link com.asyncapi.v3.schema.avro.v1._9_0.AvroSchema}
    • - *
  • {@link com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaUnion}
    • + *
  • {@link AvroSchema}
    • + *
  • {@link AvroSchemaUnion}
    • *
  • {@link Reference}
    • *
* @@ -52,8 +54,8 @@ public void setSchema(@NotNull Object schema) { /** * Schema: *
    - *
  • {@link com.asyncapi.v3.schema.avro.v1._9_0.AvroSchema}
    • - *
  • {@link com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaUnion}
    • + *
  • {@link AvroSchema}
    • + *
  • {@link AvroSchemaUnion}
    • *
  • {@link Reference}
    • *
*/ diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroSchemasProvider.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroSchemasProvider.kt index 6e708296..1150ed54 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroSchemasProvider.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroSchemasProvider.kt @@ -1,8 +1,6 @@ package com.asyncapi.v3.schema.avro -import com.asyncapi.v3.schema.avro.v1._9_0.* -import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaLogicalType -import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaType +import com.asyncapi.schemas.avro.v1._9_0.* class AvroSchemasProvider { @@ -112,7 +110,8 @@ class AvroSchemasProvider { .name("s") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaType.STRING + AvroSchemaType.NULL, + AvroSchemaType.STRING ) ) .build(), @@ -120,7 +119,8 @@ class AvroSchemasProvider { .name("h") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaType.STRING + AvroSchemaType.NULL, + AvroSchemaType.STRING ) ) .build() @@ -154,7 +154,8 @@ class AvroSchemasProvider { .name("f32") .type( AvroSchemaUnion( - AvroSchemaType.FLOAT, AvroSchemaType.NULL + AvroSchemaType.FLOAT, + AvroSchemaType.NULL ) ) .build(), @@ -205,7 +206,8 @@ class AvroSchemasProvider { .name("requestId") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaType.STRING + AvroSchemaType.NULL, + AvroSchemaType.STRING ) ) .build() @@ -239,7 +241,8 @@ class AvroSchemasProvider { .name("requestId") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaType.STRING + AvroSchemaType.NULL, + AvroSchemaType.STRING ) ) .build() @@ -272,7 +275,8 @@ class AvroSchemasProvider { .name("s") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaType.STRING + AvroSchemaType.NULL, + AvroSchemaType.STRING ) ) .defaultValue(null) @@ -281,7 +285,8 @@ class AvroSchemasProvider { .name("e") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaRecord.builder() + AvroSchemaType.NULL, + AvroSchemaRecord.builder() .type(AvroSchemaType.ERROR) .name("TestError") .fields( @@ -329,7 +334,8 @@ class AvroSchemasProvider { .name("location") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaMap.builder() + AvroSchemaType.NULL, + AvroSchemaMap.builder() .values( AvroSchemaUnion( AvroSchemaType.NULL, @@ -344,7 +350,12 @@ class AvroSchemasProvider { .build(), AvroSchemaRecordField.builder() .name("long_r2") - .type(AvroSchemaUnion(AvroSchemaType.NULL, AvroSchemaType.FLOAT)) + .type( + AvroSchemaUnion( + AvroSchemaType.NULL, + AvroSchemaType.FLOAT + ) + ) .defaultValue(null) .metadata(mapOf(Pair("field-id", 2))) .build() @@ -377,7 +388,8 @@ class AvroSchemasProvider { .name("location") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaMap.builder() + AvroSchemaType.NULL, + AvroSchemaMap.builder() .values( AvroSchemaUnion( AvroSchemaType.NULL, @@ -392,7 +404,12 @@ class AvroSchemasProvider { .build(), AvroSchemaRecordField.builder() .name("long") - .type(AvroSchemaUnion(AvroSchemaType.NULL, AvroSchemaType.FLOAT)) + .type( + AvroSchemaUnion( + AvroSchemaType.NULL, + AvroSchemaType.FLOAT + ) + ) .defaultValue(null) .metadata(mapOf(Pair("field-id", 2))) .build() @@ -612,7 +629,8 @@ class AvroSchemasProvider { .name("optionalRecord") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaRecord.builder() + AvroSchemaType.NULL, + AvroSchemaRecord.builder() .name("nestedOptionalRecord") .fields( listOf( @@ -659,7 +677,8 @@ class AvroSchemasProvider { .name("optionalEnum") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaEnum.builder() + AvroSchemaType.NULL, + AvroSchemaEnum.builder() .name("optionalEnum") .symbols(listOf("a", "b")) .build() @@ -692,7 +711,8 @@ class AvroSchemasProvider { .name("optionalArray") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaArray.builder() + AvroSchemaType.NULL, + AvroSchemaArray.builder() .items(AvroSchemaType.STRING) .build() ) @@ -722,7 +742,8 @@ class AvroSchemasProvider { .name("optionalMap") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaMap.builder() + AvroSchemaType.NULL, + AvroSchemaMap.builder() .values(AvroSchemaType.STRING) .build() ) @@ -753,7 +774,8 @@ class AvroSchemasProvider { .name("optionalFixed") .type( AvroSchemaUnion( - AvroSchemaType.NULL, AvroSchemaFixed.builder() + AvroSchemaType.NULL, + AvroSchemaFixed.builder() .name("optionalFixed") .size(1) .build() @@ -1045,7 +1067,8 @@ class AvroSchemasProvider { .name("l") .type( AvroSchemaUnion( - AvroSchemaType.STRING, AvroSchema.builder() + AvroSchemaType.STRING, + AvroSchema.builder() .type(AvroSchemaType.LONG) .logicalType(AvroSchemaLogicalType.TIMESTAMP_MILLIS) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroTest.kt index ec2b0d6a..37fb8876 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroTest.kt @@ -1,8 +1,8 @@ package com.asyncapi.v3.schema.avro import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchema -import com.asyncapi.v3.schema.avro.v1._9_0.AvroSchemaUnion +import com.asyncapi.schemas.avro.v1._9_0.AvroSchema +import com.asyncapi.schemas.avro.v1._9_0.AvroSchemaUnion import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory From d3b398ac6931d644ad3c8d3d1d2f4fd2d6978659 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:43:53 +0400 Subject: [PATCH 073/141] feat(schemas): move Multi Format Schema to schemas package --- .../com/asyncapi/schemas/AsyncAPISchema.java | 2 +- .../multiformat/AsyncAPIFormatSchema.java | 2 +- .../multiformat/AvroFormatSchema.java | 2 +- .../multiformat/JsonFormatSchema.java | 2 +- .../multiformat/MultiFormatSchema.java | 2 +- .../multiformat/OpenAPIFormatSchema.java | 2 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessagePayloadDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 2 +- .../_0_0/model/channel/message/Message.java | 2 +- .../model/channel/message/MessageTrait.java | 2 +- .../v3/_0_0/model/component/Components.java | 2 +- .../v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt | 18 +- .../v3/_0_0/GitterStreamingAsyncAPI.kt | 324 +++++++++------- .../_0_0/model/channel/message/MessageTest.kt | 67 ++-- .../model/channel/message/MessageTraitTest.kt | 40 +- .../v3/_0_0/model/component/ComponentsTest.kt | 29 +- .../com/asyncapi/v3/schema/SchemaProvider.kt | 19 +- .../asyncapi/AsyncAPIFormatSchemaTest.kt | 2 +- .../AsyncAPIFormatSchemaV2_0_0Test.kt | 142 +++++-- .../AsyncAPIFormatSchemaV2_1_0Test.kt | 142 +++++-- .../AsyncAPIFormatSchemaV2_2_0Test.kt | 142 +++++-- .../AsyncAPIFormatSchemaV2_3_0Test.kt | 142 +++++-- .../AsyncAPIFormatSchemaV2_4_0Test.kt | 142 +++++-- .../AsyncAPIFormatSchemaV2_5_0Test.kt | 142 +++++-- .../AsyncAPIFormatSchemaV2_6_0Test.kt | 142 +++++-- .../AsyncAPIFormatSchemaV3_0_0Test.kt | 142 +++++-- .../asyncapi/EmptySchemaFormatTest.kt | 72 +++- .../asyncapi/NullSchemaFormatTest.kt | 72 +++- .../asyncapi/WithoutSchemaFormatTest.kt | 72 +++- .../multiformat/avro/AvroFormatSchemaTest.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_10_0Test.kt | 362 ++++++++++++++---- .../avro/AvroSchemaFormatSchemaV1_10_1Test.kt | 362 ++++++++++++++---- .../avro/AvroSchemaFormatSchemaV1_10_2Test.kt | 362 ++++++++++++++---- .../avro/AvroSchemaFormatSchemaV1_11_0Test.kt | 362 ++++++++++++++---- .../avro/AvroSchemaFormatSchemaV1_11_1Test.kt | 362 ++++++++++++++---- .../avro/AvroSchemaFormatSchemaV1_9_0Test.kt | 362 ++++++++++++++---- .../avro/AvroSchemaFormatSchemaV1_9_1Test.kt | 362 ++++++++++++++---- .../avro/AvroSchemaFormatSchemaV1_9_2Test.kt | 362 ++++++++++++++---- .../multiformat/json/JsonFormatSchemaTest.kt | 37 +- .../openapi/OpenAPIFormatSchemaTest.kt | 2 +- .../openapi/OpenAPIFormatSchemaV3_0_0Test.kt | 22 +- .../openapi/OpenAPIFormatSchemaV3_0_1Test.kt | 22 +- .../openapi/OpenAPIFormatSchemaV3_0_2Test.kt | 22 +- .../openapi/OpenAPIFormatSchemaV3_0_3Test.kt | 22 +- 45 files changed, 3791 insertions(+), 1109 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/multiformat/AsyncAPIFormatSchema.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/multiformat/AvroFormatSchema.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/multiformat/JsonFormatSchema.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/multiformat/MultiFormatSchema.java (99%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/multiformat/OpenAPIFormatSchema.java (97%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java index 8fe9436a..2494009a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java @@ -4,7 +4,7 @@ import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAdditionalPropertiesDeserializer; import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAnyValueDeserializer; import com.asyncapi.v3.jackson.schema.AsyncAPISchemaItemsDeserializer; -import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AsyncAPIFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AsyncAPIFormatSchema.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AsyncAPIFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AsyncAPIFormatSchema.java index 88fbb793..83fa3b0f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AsyncAPIFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AsyncAPIFormatSchema.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat; +package com.asyncapi.schemas.multiformat; import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AvroFormatSchema.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AvroFormatSchema.java index 3620919d..b36094c6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/AvroFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AvroFormatSchema.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat; +package com.asyncapi.schemas.multiformat; import com.asyncapi.schemas.Reference; import com.asyncapi.schemas.AsyncAPISchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java index 0b501822..d496f40f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/JsonFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat; +package com.asyncapi.schemas.multiformat; import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.JsonSchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/MultiFormatSchema.java similarity index 99% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/MultiFormatSchema.java index 6093ee9c..1fd12a48 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/MultiFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/MultiFormatSchema.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat; +package com.asyncapi.schemas.multiformat; import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.schemas.Reference; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/OpenAPIFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/OpenAPIFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java index 8af5f060..08124a7c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/OpenAPIFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat; +package com.asyncapi.schemas.multiformat; import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 77622986..305081c7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java index 8b0770fc..eb3975ae 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; import com.asyncapi.schemas.Reference; -import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index 619a6f6b..33807220 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.jackson.model.component; import com.asyncapi.schemas.Reference; -import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java index ee3d515e..dbbce65d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java @@ -12,7 +12,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.bindings.MessageBindingsDeserializer; -import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java index 7ae8dd83..3a722fc0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.bindings.MessageBindingsDeserializer; -import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index 6672e417..31d36775 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -23,7 +23,7 @@ import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.bindings.ServerBindingsDeserializer; -import com.asyncapi.v3.schema.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v3.security_scheme.SecurityScheme; import com.asyncapi.schemas.ExtendableObject; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt index 13587cdf..13aef6a5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt @@ -20,7 +20,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguratio import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import com.asyncapi.v3.security_scheme.SecurityScheme class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { @@ -261,10 +261,12 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { )) .build() ) - .payload(AvroFormatSchema( + .payload( + AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", - Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingRequestPayload.avsc") - )) + Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingRequestPayload.avsc") + ) + ) .build() ), Pair("costingResponse", Message.builder() @@ -298,10 +300,12 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { )) .build() ) - .payload(AvroFormatSchema( + .payload( + AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", - Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingResponsePayload.avsc") - )) + Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingResponsePayload.avsc") + ) + ) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index e9cbdcc5..0c895899 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -14,7 +14,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.multiformat.JsonFormatSchema +import com.asyncapi.schemas.multiformat.JsonFormatSchema import com.asyncapi.v3.security_scheme.http.HttpSecurityScheme class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { @@ -112,152 +112,202 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { "application/schema+yaml;version=draft-07", JsonSchema.builder() .type("object") - .properties(mapOf( - Pair("id", JsonSchema.builder() - .type("string") - .description("ID of the message.") - .build() - ), - Pair("text", JsonSchema.builder() - .type("string") - .description("Original message in plain-text/markdown.") - .build() - ), - Pair("html", JsonSchema.builder() - .type("string") - .description("HTML formatted message.") - .build() - ), - Pair("sent", JsonSchema.builder() - .type("string") - .format("date-time") - .description("ISO formatted date of the message.") - .build() - ), - Pair("fromUser", JsonSchema.builder() - .type("object") - .description("User that sent the message.") - .properties(mapOf( - Pair("id", JsonSchema.builder() + .properties( + mapOf( + Pair( + "id", JsonSchema.builder() .type("string") - .description("Gitter User ID.") + .description("ID of the message.") .build() - ), - Pair("username", JsonSchema.builder() + ), + Pair( + "text", JsonSchema.builder() .type("string") - .description("Gitter/GitHub username.") + .description("Original message in plain-text/markdown.") .build() - ), - Pair("displayName", JsonSchema.builder() + ), + Pair( + "html", JsonSchema.builder() .type("string") - .description("Gitter/GitHub user real name.") + .description("HTML formatted message.") .build() - ), - Pair("url", JsonSchema.builder() + ), + Pair( + "sent", JsonSchema.builder() .type("string") - .description("Path to the user on Gitter.") + .format("date-time") + .description("ISO formatted date of the message.") .build() - ), - Pair("avatarUrl", JsonSchema.builder() - .type("string") - .format("uri") - .description("User avatar URI.") + ), + Pair( + "fromUser", JsonSchema.builder() + .type("object") + .description("User that sent the message.") + .properties( + mapOf( + Pair( + "id", JsonSchema.builder() + .type("string") + .description("Gitter User ID.") + .build() + ), + Pair( + "username", JsonSchema.builder() + .type("string") + .description("Gitter/GitHub username.") + .build() + ), + Pair( + "displayName", JsonSchema.builder() + .type("string") + .description("Gitter/GitHub user real name.") + .build() + ), + Pair( + "url", JsonSchema.builder() + .type("string") + .description("Path to the user on Gitter.") + .build() + ), + Pair( + "avatarUrl", JsonSchema.builder() + .type("string") + .format("uri") + .description("User avatar URI.") + .build() + ), + Pair( + "avatarUrlSmall", JsonSchema.builder() + .type("string") + .format("uri") + .description("User avatar URI (small).") + .build() + ), + Pair( + "avatarUrlMedium", JsonSchema.builder() + .type("string") + .format("uri") + .description("User avatar URI (medium).") + .build() + ), + Pair( + "v", JsonSchema.builder() + .type("number") + .description("Version.") + .build() + ), + Pair( + "gv", JsonSchema.builder() + .type("string") + .description("Stands for \"Gravatar version\" and is used for cache busting.") + .build() + ), + ) + ) .build() - ), - Pair("avatarUrlSmall", JsonSchema.builder() - .type("string") - .format("uri") - .description("User avatar URI (small).") + ), + Pair( + "unread", JsonSchema.builder() + .type("boolean") + .description("Boolean that indicates if the current user has read the message.") .build() - ), - Pair("avatarUrlMedium", JsonSchema.builder() - .type("string") - .format("uri") - .description("User avatar URI (medium).") + ), + Pair( + "readBy", JsonSchema.builder() + .type("number") + .description("Number of users that have read the message.") + .build() + ), + Pair( + "urls", JsonSchema.builder() + .type("array") + .description("List of URLs present in the message.") + .items( + JsonSchema.builder() + .type("string") + .format("uri") + .build() + ) + .build() + ), + Pair( + "mentions", JsonSchema.builder() + .type("array") + .description("List of @Mentions in the message.") + .items( + JsonSchema.builder() + .type("object") + .properties( + mapOf( + Pair( + "screenName", + JsonSchema.builder().type("string") + .build() + ), + Pair( + "userId", + JsonSchema.builder().type("string") + .build() + ), + Pair( + "userIds", JsonSchema.builder() + .type("array") + .items( + JsonSchema.builder() + .type("string").build() + ) + .build() + ), + ) + ) + .build() + ) + .build() + ), + Pair( + "issues", JsonSchema.builder() + .type("array") + .description("List of #Issues referenced in the message.") + .items( + JsonSchema.builder() + .type("object") + .properties( + mapOf( + Pair( + "number", + JsonSchema.builder().type("string") + .build() + ), + ) + ) + .build() + ) .build() - ), - Pair("v", JsonSchema.builder() + ), + Pair( + "meta", JsonSchema.builder() + .type("array") + .description("Metadata. This is currently not used for anything.") + .items(JsonSchema.builder().build()) + .build() + ), + Pair( + "v", JsonSchema.builder() .type("number") .description("Version.") .build() - ), - Pair("gv", JsonSchema.builder() + ), + Pair( + "gv", JsonSchema.builder() .type("string") .description("Stands for \"Gravatar version\" and is used for cache busting.") .build() - ), - )) - .build() - ), - Pair("unread", JsonSchema.builder() - .type("boolean") - .description("Boolean that indicates if the current user has read the message.") - .build() - ), - Pair("readBy", JsonSchema.builder() - .type("number") - .description("Number of users that have read the message.") - .build() - ), - Pair("urls", JsonSchema.builder() - .type("array") - .description("List of URLs present in the message.") - .items(JsonSchema.builder() - .type("string") - .format("uri") - .build() - ) - .build() - ), - Pair("mentions", JsonSchema.builder() - .type("array") - .description("List of @Mentions in the message.") - .items(JsonSchema.builder() - .type("object") - .properties(mapOf( - Pair("screenName", JsonSchema.builder().type("string").build()), - Pair("userId", JsonSchema.builder().type("string").build()), - Pair("userIds", JsonSchema.builder() - .type("array") - .items(JsonSchema.builder().type("string").build()) - .build() - ), - )) - .build() - ) - .build() - ), - Pair("issues", JsonSchema.builder() - .type("array") - .description("List of #Issues referenced in the message.") - .items(JsonSchema.builder() - .type("object") - .properties(mapOf( - Pair("number", JsonSchema.builder().type("string").build()), - )) - .build() - ) - .build() - ), - Pair("meta", JsonSchema.builder() - .type("array") - .description("Metadata. This is currently not used for anything.") - .items(JsonSchema.builder().build()) - .build() - ), - Pair("v", JsonSchema.builder() - .type("number") - .description("Version.") - .build() - ), - Pair("gv", JsonSchema.builder() - .type("string") - .description("Stands for \"Gravatar version\" and is used for cache busting.") - .build() - ), - )) + ), + ) + ) .build() - )) + ) + ) .bindings(mapOf( Pair("http", HTTPMessageBinding.builder() .headers( @@ -284,13 +334,15 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { .build()), Pair("heartbeat", Message.builder() .summary("Its purpose is to keep the connection alive.") - .payload(JsonFormatSchema( - "application/schema+yaml;version=draft-07", - JsonSchema.builder() - .type("string") - .enumValue(listOf("\r\n")) - .build() - )) + .payload( + JsonFormatSchema( + "application/schema+yaml;version=draft-07", + JsonSchema.builder() + .type("string") + .enumValue(listOf("\r\n")) + .build() + ) + ) .bindings(mapOf( Pair("http", HTTPMessageBinding.builder() .headers( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 7176da8d..628b8038 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema class MessageTestWithSchema: SerDeTest() { @@ -218,37 +218,48 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { override fun build(): Message { return Message.builder() - .headers(AsyncAPIFormatSchema( + .headers( + AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", AsyncAPISchema.builder() - .type("object") - .properties(mapOf( - Pair("correlationId", AsyncAPISchema.builder() - .type("string") - .description("Correlation ID set by application") - .build() - ), - Pair("applicationInstanceId", AsyncAPISchema.builder() - .type("string") - .description("Unique identifier for a given instance of the publishing application") - .build() - ) - )) - .build() - )) - .payload(AsyncAPIFormatSchema( + .type("object") + .properties( + mapOf( + Pair( + "correlationId", AsyncAPISchema.builder() + .type("string") + .description("Correlation ID set by application") + .build() + ), + Pair( + "applicationInstanceId", AsyncAPISchema.builder() + .type("string") + .description("Unique identifier for a given instance of the publishing application") + .build() + ) + ) + ) + .build() + ) + ) + .payload( + AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", AsyncAPISchema.builder() - .type("object") - .properties(mapOf( - Pair("metric", AsyncAPISchema.builder() - .type("string") - .description("Metric set by application") - .build() - ) - )) - .build() - )) + .type("object") + .properties( + mapOf( + Pair( + "metric", AsyncAPISchema.builder() + .type("string") + .description("Metric set by application") + .build() + ) + ) + ) + .build() + ) + ) .correlationId(Reference("#/components/messages/message-correlation-id")) .contentType("application/json") .name("UserSignup") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 31014732..cdc1c5a9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema class MessageTraitTestWithSchema: SerDeTest() { @@ -195,24 +195,30 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { override fun build(): MessageTrait { return MessageTrait.builder() - .headers(AsyncAPIFormatSchema( + .headers( + AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", AsyncAPISchema.builder() - .type("object") - .properties(mapOf( - Pair("correlationId", AsyncAPISchema.builder() - .type("string") - .description("Correlation ID set by application") - .build() - ), - Pair("applicationInstanceId", AsyncAPISchema.builder() - .type("string") - .description("Unique identifier for a given instance of the publishing application") - .build() - ) - )) - .build() - )) + .type("object") + .properties( + mapOf( + Pair( + "correlationId", AsyncAPISchema.builder() + .type("string") + .description("Correlation ID set by application") + .build() + ), + Pair( + "applicationInstanceId", AsyncAPISchema.builder() + .type("string") + .description("Unique identifier for a given instance of the publishing application") + .build() + ) + ) + ) + .build() + ) + ) .correlationId(Reference("#/components/messages/message-correlation-id")) .contentType("application/json") .name("UserSignup") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt index 637d6611..6e437f5a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.v3._0_0.model.server.ServerVariableTest import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.Type -import com.asyncapi.v3.schema.multiformat.JsonFormatSchema +import com.asyncapi.schemas.multiformat.JsonFormatSchema import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest import com.asyncapi.v3.security_scheme.OpenIdConnectSecuritySchemeTest import com.asyncapi.v3.security_scheme.http.HttpApiKeySecuritySchemeTest @@ -62,19 +62,24 @@ class ComponentsTest: SerDeTest() { "application/schema+json;version=draft-07", JsonSchema.builder() .type("object") - .properties(mapOf( - Pair("id", JsonSchema.builder() - .type("integer") - .format("int64") - .build() - ), - Pair("name", JsonSchema.builder() - .type("string") - .build() + .properties( + mapOf( + Pair( + "id", JsonSchema.builder() + .type("integer") + .format("int64") + .build() + ), + Pair( + "name", JsonSchema.builder() + .type("string") + .build() + ) ) - )) + ) .build() - )), + ) + ), Pair("User", Reference("#/components/schemas/user")) )) .servers(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt index 38845370..e9dd5dee 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt @@ -2,8 +2,8 @@ package com.asyncapi.v3.schema import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema -import com.asyncapi.v3.schema.multiformat.JsonFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.JsonFormatSchema import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema interface SchemaProvider { @@ -11,14 +11,23 @@ interface SchemaProvider { fun jsonSchema(): JsonSchema = JsonSchema() - fun jsonFormatSchemaJson(): JsonFormatSchema = JsonFormatSchema(jsonSchema()) + fun jsonFormatSchemaJson(): JsonFormatSchema = + JsonFormatSchema(jsonSchema()) - fun jsonFormatSchemaYaml(): JsonFormatSchema = JsonFormatSchema("application/schema+yaml;version=draft-07", jsonSchema()) + fun jsonFormatSchemaYaml(): JsonFormatSchema = + JsonFormatSchema( + "application/schema+yaml;version=draft-07", + jsonSchema() + ) fun asyncAPISchema(): AsyncAPISchema = AsyncAPISchema() - fun asyncAPIFormatSchemaEmptySchemaFormat(): AsyncAPIFormatSchema = AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", asyncAPISchema()) + fun asyncAPIFormatSchemaEmptySchemaFormat(): AsyncAPIFormatSchema = + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + asyncAPISchema() + ) fun openAPISchema(): OpenAPISchema = OpenAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt index e076b795..9aa52478 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt index 6c70dda0..4ebb0d84 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,60 +35,102 @@ abstract class AsyncAPIFormatSchemaV2_0_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.0.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -101,60 +143,102 @@ abstract class AsyncAPIFormatSchemaV2_0_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.0.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt index fde6fb5c..f63f6edc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,60 +35,102 @@ abstract class AsyncAPIFormatSchemaV2_1_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.1.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.1.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.1.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.1.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.1.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.1.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.1.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.1.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.1.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.1.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.1.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.1.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.1.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.1.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -101,60 +143,102 @@ abstract class AsyncAPIFormatSchemaV2_1_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.1.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.1.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.1.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.1.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.1.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.1.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.1.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.1.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.1.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.1.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.1.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.1.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.1.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.1.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.1.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.1.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt index 205bdd81..20fa4ea4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,60 +35,102 @@ abstract class AsyncAPIFormatSchemaV2_2_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.2.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.2.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.2.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.2.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.2.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.2.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.2.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.2.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.2.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.2.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.2.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.2.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.2.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.2.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -101,60 +143,102 @@ abstract class AsyncAPIFormatSchemaV2_2_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.2.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.2.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.2.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.2.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.2.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.2.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.2.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.2.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.2.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.2.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.2.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.2.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.2.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.2.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.2.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.2.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt index da5fe7ad..8a0286ae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,60 +35,102 @@ abstract class AsyncAPIFormatSchemaV2_3_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.3.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.3.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.3.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.3.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.3.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.3.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.3.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.3.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.3.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.3.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.3.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.3.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.3.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.3.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -101,60 +143,102 @@ abstract class AsyncAPIFormatSchemaV2_3_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.3.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.3.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.3.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.3.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.3.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.3.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.3.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.3.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.3.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.3.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.3.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.3.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.3.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.3.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.3.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.3.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt index c7063fbc..e1fd15d9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,60 +35,102 @@ abstract class AsyncAPIFormatSchemaV2_4_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.4.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.4.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.4.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.4.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.4.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.4.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.4.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.4.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.4.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.4.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.4.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.4.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.4.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.4.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -101,60 +143,102 @@ abstract class AsyncAPIFormatSchemaV2_4_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.4.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.4.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.4.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.4.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.4.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.4.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.4.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.4.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.4.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.4.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.4.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.4.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.4.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.4.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.4.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.4.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt index 61424c32..0e538842 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,60 +35,102 @@ abstract class AsyncAPIFormatSchemaV2_5_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.5.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.5.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.5.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.5.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.5.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.5.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.5.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.5.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.5.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.5.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.5.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.5.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.5.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.5.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -101,60 +143,102 @@ abstract class AsyncAPIFormatSchemaV2_5_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.5.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.5.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.5.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.5.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.5.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.5.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.5.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.5.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.5.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.5.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.5.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.5.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.5.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.5.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.5.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.5.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt index 97d059e6..a56552eb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,60 +35,102 @@ abstract class AsyncAPIFormatSchemaV2_6_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.6.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.6.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.6.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.6.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.6.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.6.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.6.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.6.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.6.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.6.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.6.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.6.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=2.6.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=2.6.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -101,60 +143,102 @@ abstract class AsyncAPIFormatSchemaV2_6_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.6.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.6.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.6.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.6.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.6.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.6.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.6.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.6.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.6.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.6.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.6.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.6.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=2.6.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=2.6.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=2.6.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=2.6.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt index 1f432975..8b610ed0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,60 +35,102 @@ abstract class AsyncAPIFormatSchemaV3_0_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -101,60 +143,102 @@ abstract class AsyncAPIFormatSchemaV3_0_0Test: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+yaml;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+yaml;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ), // Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt index 009363db..8e465273 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,30 +35,51 @@ abstract class EmptySchemaFormatTest: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/schemaFormat is empty/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -71,30 +92,51 @@ abstract class EmptySchemaFormatTest: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/schemaFormat is empty/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is empty/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt index 043ae506..757a93c9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,31 +35,52 @@ abstract class NullSchemaFormatTest: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -72,31 +93,52 @@ abstract class NullSchemaFormatTest: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/schemaFormat is null/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt index 86333980..9b3bccc8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.asyncapi import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,31 +35,52 @@ abstract class WithoutSchemaFormatTest: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/arrays.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/complex-object.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/conditional-validation-if-else.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/enumerated-values.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/person.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/regex-pattern.schema.json", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } @@ -72,31 +93,52 @@ abstract class WithoutSchemaFormatTest: AsyncAPIFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/arrays.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ArraysSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/complex-object.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ComplexObjectTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/conditional-validation-if-else.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + ConditionalValidationIfElse().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/enumerated-values.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + EnumeratedValuesTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/person.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + PersonTest().asyncAPISchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/without schemaFormat/regex-pattern.schema.yaml", - AsyncAPIFormatSchema("application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema()) + AsyncAPIFormatSchema( + "application/vnd.aai.asyncapi+json;version=3.0.0", + RegexPatternTest().asyncAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroFormatSchemaTest.kt index af4a4912..4619d886 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroFormatSchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.avro import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt index 8b28c946..81b95070 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.avro import com.asyncapi.v3.schema.avro.AvroSchemasProvider -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,148 +35,256 @@ abstract class AvroFormatSchemaV1_10_0Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } @@ -189,148 +297,256 @@ abstract class AvroFormatSchemaV1_10_0Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt index b9291bab..a68a1e3a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.avro import com.asyncapi.v3.schema.avro.AvroSchemasProvider -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,148 +35,256 @@ abstract class AvroFormatSchemaV1_10_1Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } @@ -189,148 +297,256 @@ abstract class AvroFormatSchemaV1_10_1Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt index d6ddda20..d3a269f1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.avro import com.asyncapi.v3.schema.avro.AvroSchemasProvider -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,148 +35,256 @@ abstract class AvroFormatSchemaV1_10_2Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.10.2", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } @@ -189,148 +297,256 @@ abstract class AvroFormatSchemaV1_10_2Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.10.2", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.10.2", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt index 13ee0c27..9baa7d4e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.avro import com.asyncapi.v3.schema.avro.AvroSchemasProvider -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,148 +35,256 @@ abstract class AvroFormatSchemaV1_11_0Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } @@ -189,148 +297,256 @@ abstract class AvroFormatSchemaV1_11_0Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt index d972a95f..891332a8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.avro import com.asyncapi.v3.schema.avro.AvroSchemasProvider -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,148 +35,256 @@ abstract class AvroFormatSchemaV1_11_1Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.11.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } @@ -189,148 +297,256 @@ abstract class AvroFormatSchemaV1_11_1Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.11.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.11.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt index 9bd6c750..b95adee3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.avro import com.asyncapi.v3.schema.avro.AvroSchemasProvider -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,148 +35,256 @@ abstract class AvroFormatSchemaV1_9_0Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } @@ -189,148 +297,256 @@ abstract class AvroFormatSchemaV1_9_0Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt index 5cbe22bc..38a9ccc3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.avro import com.asyncapi.v3.schema.avro.AvroSchemasProvider -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,148 +35,256 @@ abstract class AvroFormatSchemaV1_9_1Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } @@ -189,148 +297,256 @@ abstract class AvroFormatSchemaV1_9_1Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.1", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt index 9d8e448b..8121cbe4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.avro import com.asyncapi.v3.schema.avro.AvroSchemasProvider -import com.asyncapi.v3.schema.multiformat.AvroFormatSchema +import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -35,148 +35,256 @@ abstract class AvroFormatSchemaV1_9_2Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+json;version=1.9.2", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.json", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } @@ -189,148 +297,256 @@ abstract class AvroFormatSchemaV1_9_2Test: AvroFormatSchemaTest() { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro+yaml;version=1.9.2", + AvroSchemasProvider().unionAndFixedFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().applicationEventTest()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().applicationEventTest() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().documentInfo()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().documentInfo() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fooBar()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().fooBar() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fullRecordV1()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().fullRecordV1() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fullRecordV2()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().fullRecordV2() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().logicalUUID()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().logicalUUID() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().logicalTypesWithMultipleFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().logicalTypesWithMultipleFields() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().myResponse()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().myResponse() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().regressionErrorFieldInRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().regressionErrorFieldInRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocation()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().schemaLocation() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocationRead()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().schemaLocationRead() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocationWrite()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().schemaLocationWrite() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaBuilder()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().schemaBuilder() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().simpleRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().simpleRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testRecordWithLogicalTypes()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().testRecordWithLogicalTypes() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testRecordWithMapsAndArrays()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().testRecordWithMapsAndArrays() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testUnionRecord()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().testUnionRecord() + ) ), Arguments.of( "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.yaml", - AvroFormatSchema("application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().unionAndFixedFields()) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.2", + AvroSchemasProvider().unionAndFixedFields() + ) ), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt index b8d5f9ff..d2d622e4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v3.schema.multiformat.json import com.asyncapi.v3.ClasspathUtils import com.asyncapi.v3.schema.json.* -import com.asyncapi.v3.schema.multiformat.JsonFormatSchema +import com.asyncapi.schemas.multiformat.JsonFormatSchema import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory @@ -92,31 +92,52 @@ abstract class JsonFormatSchemaTest { return Stream.of( Arguments.of( "/json/v3/schema/multiformat/json/schema+yaml/arrays.schema.yaml", - JsonFormatSchema("application/schema+yaml;version=draft-07", ArraysSchemaTest().jsonSchema()) + JsonFormatSchema( + "application/schema+yaml;version=draft-07", + ArraysSchemaTest().jsonSchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/json/schema+yaml/complex-object.schema.yaml", - JsonFormatSchema("application/schema+yaml;version=draft-07", ComplexObjectTest().jsonSchema()) + JsonFormatSchema( + "application/schema+yaml;version=draft-07", + ComplexObjectTest().jsonSchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/json/schema+yaml/conditional-validation-if-else.schema.yaml", - JsonFormatSchema("application/schema+yaml;version=draft-07", ConditionalValidationIfElse().jsonSchema()) + JsonFormatSchema( + "application/schema+yaml;version=draft-07", + ConditionalValidationIfElse().jsonSchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/json/schema+yaml/draft-07-core-schema-meta-schema.yaml", - JsonFormatSchema("application/schema+yaml;version=draft-07", Draft07CoreSchemaMetaSchemaTest().jsonSchema()) + JsonFormatSchema( + "application/schema+yaml;version=draft-07", + Draft07CoreSchemaMetaSchemaTest().jsonSchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/json/schema+yaml/enumerated-values.schema.yaml", - JsonFormatSchema("application/schema+yaml;version=draft-07", EnumeratedValuesTest().jsonSchema()) + JsonFormatSchema( + "application/schema+yaml;version=draft-07", + EnumeratedValuesTest().jsonSchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/json/schema+yaml/person.schema.yaml", - JsonFormatSchema("application/schema+yaml;version=draft-07", PersonTest().jsonSchema()) + JsonFormatSchema( + "application/schema+yaml;version=draft-07", + PersonTest().jsonSchema() + ) ), Arguments.of( "/json/v3/schema/multiformat/json/schema+yaml/regex-pattern.schema.yaml", - JsonFormatSchema("application/schema+yaml;version=draft-07", RegexPatternTest().jsonSchema()) + JsonFormatSchema( + "application/schema+yaml;version=draft-07", + RegexPatternTest().jsonSchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaTest.kt index 8acfbc49..07c93aa2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.openapi import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt index 1643aae4..53272391 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.openapi -import com.asyncapi.v3.schema.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest @@ -34,10 +34,16 @@ abstract class OpenAPIFormatSchemaV3_0_0Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of("/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.json", - OpenAPIFormatSchema("application/vnd.oai.openapi;version=3.0.0", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi;version=3.0.0", + SchemaTest().openAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi+json/schema.json", - OpenAPIFormatSchema("application/vnd.oai.openapi+json;version=3.0.0", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi+json;version=3.0.0", + SchemaTest().openAPISchema() + ) ) ) } @@ -49,10 +55,16 @@ abstract class OpenAPIFormatSchemaV3_0_0Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of("/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.yaml", - OpenAPIFormatSchema("application/vnd.oai.openapi;version=3.0.0", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi;version=3.0.0", + SchemaTest().openAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi+yaml/schema.yaml", - OpenAPIFormatSchema("application/vnd.oai.openapi+yaml;version=3.0.0", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi+yaml;version=3.0.0", + SchemaTest().openAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt index f4de776d..1cd94c04 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.openapi -import com.asyncapi.v3.schema.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest @@ -34,10 +34,16 @@ abstract class OpenAPIFormatSchemaV3_0_1Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of("/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.json", - OpenAPIFormatSchema("application/vnd.oai.openapi;version=3.0.1", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi;version=3.0.1", + SchemaTest().openAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi+json/schema.json", - OpenAPIFormatSchema("application/vnd.oai.openapi+json;version=3.0.1", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi+json;version=3.0.1", + SchemaTest().openAPISchema() + ) ) ) } @@ -49,10 +55,16 @@ abstract class OpenAPIFormatSchemaV3_0_1Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of("/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.yaml", - OpenAPIFormatSchema("application/vnd.oai.openapi;version=3.0.1", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi;version=3.0.1", + SchemaTest().openAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi+yaml/schema.yaml", - OpenAPIFormatSchema("application/vnd.oai.openapi+yaml;version=3.0.1", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi+yaml;version=3.0.1", + SchemaTest().openAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt index 8bab13d0..de83517d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.openapi -import com.asyncapi.v3.schema.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest @@ -34,10 +34,16 @@ abstract class OpenAPIFormatSchemaV3_0_2Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of("/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.json", - OpenAPIFormatSchema("application/vnd.oai.openapi;version=3.0.2", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi;version=3.0.2", + SchemaTest().openAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi+json/schema.json", - OpenAPIFormatSchema("application/vnd.oai.openapi+json;version=3.0.2", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi+json;version=3.0.2", + SchemaTest().openAPISchema() + ) ) ) } @@ -49,10 +55,16 @@ abstract class OpenAPIFormatSchemaV3_0_2Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of("/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.yaml", - OpenAPIFormatSchema("application/vnd.oai.openapi;version=3.0.2", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi;version=3.0.2", + SchemaTest().openAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi+yaml/schema.yaml", - OpenAPIFormatSchema("application/vnd.oai.openapi+yaml;version=3.0.2", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi+yaml;version=3.0.2", + SchemaTest().openAPISchema() + ) ) ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt index b432763d..42006511 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.openapi -import com.asyncapi.v3.schema.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest @@ -34,10 +34,16 @@ abstract class OpenAPIFormatSchemaV3_0_3Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of("/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.json", - OpenAPIFormatSchema("application/vnd.oai.openapi;version=3.0.3", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi;version=3.0.3", + SchemaTest().openAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi+json/schema.json", - OpenAPIFormatSchema("application/vnd.oai.openapi+json;version=3.0.3", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi+json;version=3.0.3", + SchemaTest().openAPISchema() + ) ) ) } @@ -49,10 +55,16 @@ abstract class OpenAPIFormatSchemaV3_0_3Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of("/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.yaml", - OpenAPIFormatSchema("application/vnd.oai.openapi;version=3.0.3", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi;version=3.0.3", + SchemaTest().openAPISchema() + ) ), Arguments.of("/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi+yaml/schema.yaml", - OpenAPIFormatSchema("application/vnd.oai.openapi+yaml;version=3.0.3", SchemaTest().openAPISchema()) + OpenAPIFormatSchema( + "application/vnd.oai.openapi+yaml;version=3.0.3", + SchemaTest().openAPISchema() + ) ) ) } From 579c0778df91fca546968cc3cbeb595a6d3ff26b Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:45:17 +0400 Subject: [PATCH 074/141] feat(schemas): move OpenAPI Schema to schemas package --- .../multiformat/OpenAPIFormatSchema.java | 2 +- .../openapi/v3/_0_0/OpenAPISchema.java | 10 +++++----- .../v3/_0_0/properties/Discriminator.java | 2 +- .../v3/_0_0/properties/Extensions.java | 2 +- .../properties/ExternalDocumentation.java | 2 +- .../openapi/v3/_0_0/properties/XML.java | 2 +- ...chemaAdditionalPropertiesDeserializer.java | 2 +- .../OpenAPISchemaAnyValueDeserializer.java | 2 +- .../properties/ExampleEnumDefaultArrayTest.kt | 4 ++-- .../properties/ExampleEnumDefaultNullTest.kt | 4 ++-- .../com/asyncapi/v3/schema/SchemaProvider.kt | 5 +++-- .../openapi/v3/_0_0/OpenAPISchemaTest.kt | 3 ++- .../v3/schema/openapi/v3/_0_0/SchemaTest.kt | 19 ++++++++++++------- 13 files changed, 33 insertions(+), 26 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/openapi/v3/_0_0/OpenAPISchema.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/openapi/v3/_0_0/properties/Discriminator.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/openapi/v3/_0_0/properties/Extensions.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/openapi/v3/_0_0/properties/ExternalDocumentation.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/schema => schemas}/openapi/v3/_0_0/properties/XML.java (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt (89%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt (74%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java index 08124a7c..badf8a93 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat; import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema; +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java index 5f3af15a..173fc450 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java @@ -1,11 +1,11 @@ -package com.asyncapi.v3.schema.openapi.v3._0_0; +package com.asyncapi.schemas.openapi.v3._0_0; import com.asyncapi.v3.jackson.schema.openapi.OpenAPISchemaAdditionalPropertiesDeserializer; import com.asyncapi.v3.jackson.schema.openapi.OpenAPISchemaAnyValueDeserializer; -import com.asyncapi.v3.schema.openapi.v3._0_0.properties.Discriminator; -import com.asyncapi.v3.schema.openapi.v3._0_0.properties.Extensions; -import com.asyncapi.v3.schema.openapi.v3._0_0.properties.ExternalDocumentation; -import com.asyncapi.v3.schema.openapi.v3._0_0.properties.XML; +import com.asyncapi.schemas.openapi.v3._0_0.properties.Discriminator; +import com.asyncapi.schemas.openapi.v3._0_0.properties.Extensions; +import com.asyncapi.schemas.openapi.v3._0_0.properties.ExternalDocumentation; +import com.asyncapi.schemas.openapi.v3._0_0.properties.XML; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Discriminator.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/Discriminator.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Discriminator.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/Discriminator.java index fc12e2ae..bc7ff05c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Discriminator.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/Discriminator.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.openapi.v3._0_0.properties; +package com.asyncapi.schemas.openapi.v3._0_0.properties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Extensions.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/Extensions.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Extensions.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/Extensions.java index 02eaee88..7f779166 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/Extensions.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/Extensions.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.openapi.v3._0_0.properties; +package com.asyncapi.schemas.openapi.v3._0_0.properties; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExternalDocumentation.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/ExternalDocumentation.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExternalDocumentation.java index 7289f546..099a7fdc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExternalDocumentation.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.openapi.v3._0_0.properties; +package com.asyncapi.schemas.openapi.v3._0_0.properties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/XML.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/XML.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/XML.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/XML.java index 7739011f..5df5a9d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/XML.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/XML.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.openapi.v3._0_0.properties; +package com.asyncapi.schemas.openapi.v3._0_0.properties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java index 34828aad..5c416bdf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3.jackson.schema.openapi; -import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema; +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java index 1d09695f..8ccb64f9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.jackson.schema.openapi; import com.asyncapi.v3.jackson.schema.SchemaAnyValueDeserializer; -import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema; +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; /** * OpenAPI Schema any value deserializer diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt similarity index 89% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt index 3c1c877e..ffec5f32 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt @@ -1,7 +1,7 @@ -package com.asyncapi.v3.schema.openapi.v3._0_0.properties +package com.asyncapi.schemas.openapi.v3._0_0.properties import com.asyncapi.v3.schema.SchemaProvider -import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema class ExampleEnumDefaultArrayTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt similarity index 74% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt index 805357c8..aad61331 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt @@ -1,7 +1,7 @@ -package com.asyncapi.v3.schema.openapi.v3._0_0.properties +package com.asyncapi.schemas.openapi.v3._0_0.properties import com.asyncapi.v3.schema.SchemaProvider -import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema class ExampleEnumDefaultNullTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt index e9dd5dee..65f11cc1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt @@ -4,7 +4,7 @@ import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import com.asyncapi.schemas.multiformat.JsonFormatSchema -import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema interface SchemaProvider { @@ -29,6 +29,7 @@ interface SchemaProvider { asyncAPISchema() ) - fun openAPISchema(): OpenAPISchema = OpenAPISchema() + fun openAPISchema(): OpenAPISchema = + OpenAPISchema() } \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchemaTest.kt index b3e92b4f..ae700ca3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchemaTest.kt @@ -1,8 +1,9 @@ package com.asyncapi.v3.schema.openapi.v3._0_0 +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema import com.asyncapi.v3.ClasspathUtils import com.asyncapi.v3.schema.SchemaProvider -import com.asyncapi.v3.schema.openapi.v3._0_0.properties.* +import com.asyncapi.schemas.openapi.v3._0_0.properties.* import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/SchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/SchemaTest.kt index 5e8f9532..f151c067 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/SchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/SchemaTest.kt @@ -1,9 +1,10 @@ package com.asyncapi.v3.schema.openapi.v3._0_0 +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema import com.asyncapi.v3.schema.SchemaProvider -import com.asyncapi.v3.schema.openapi.v3._0_0.properties.Discriminator -import com.asyncapi.v3.schema.openapi.v3._0_0.properties.ExternalDocumentation -import com.asyncapi.v3.schema.openapi.v3._0_0.properties.XML +import com.asyncapi.schemas.openapi.v3._0_0.properties.Discriminator +import com.asyncapi.schemas.openapi.v3._0_0.properties.ExternalDocumentation +import com.asyncapi.schemas.openapi.v3._0_0.properties.XML import java.math.BigDecimal class SchemaTest: SchemaProvider { @@ -87,7 +88,8 @@ class SchemaTest: SchemaProvider { .required(listOf("pet_type")) .build() )) - .not(OpenAPISchema.builder() + .not( + OpenAPISchema.builder() .name("Pet by type") .type("object") .properties(mapOf( @@ -112,7 +114,8 @@ class SchemaTest: SchemaProvider { .build() ) )) - .additionalProperties(OpenAPISchema.builder() + .additionalProperties( + OpenAPISchema.builder() .properties(mapOf( Pair("pet_type", OpenAPISchema.builder() .type("string") @@ -121,7 +124,8 @@ class SchemaTest: SchemaProvider { .build() ) )) - .additionalProperties(OpenAPISchema.builder() + .additionalProperties( + OpenAPISchema.builder() .properties(mapOf( Pair("hunts", OpenAPISchema.builder() .type("boolean") @@ -138,7 +142,8 @@ class SchemaTest: SchemaProvider { .nullable(true) .readOnly(true) .writeOnly(true) - .example(OpenAPISchema.builder() + .example( + OpenAPISchema.builder() .type("string") .enumValue(listOf("approved", "pending", "closed", "new")) .example("approved") From 4992660253e984f7126da1abdfcd6ec64e2d792f Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 01:47:54 +0400 Subject: [PATCH 075/141] feat(schemas): move Jackson for Schemas to schemas package --- .../src/main/java/com/asyncapi/schemas/AsyncAPISchema.java | 6 +++--- .../src/main/java/com/asyncapi/schemas/JsonSchema.java | 6 +++--- .../AsyncAPISchemaAdditionalPropertiesDeserializer.java | 2 +- .../jackson}/AsyncAPISchemaAnyValueDeserializer.java | 2 +- .../jackson}/AsyncAPISchemaItemsDeserializer.java | 2 +- .../jackson}/JsonSchemaAnyValueDeserializer.java | 2 +- .../jackson}/JsonSchemaItemsDeserializer.java | 2 +- .../jackson}/JsonSchemaPropertiesDeserializer.java | 2 +- .../jackson}/SchemaAnyValueDeserializer.java | 2 +- .../OpenAPISchemaAdditionalPropertiesDeserializer.java | 2 +- .../jackson}/openapi/OpenAPISchemaAnyValueDeserializer.java | 4 ++-- .../com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/schema => schemas/jackson}/AsyncAPISchemaAdditionalPropertiesDeserializer.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/schema => schemas/jackson}/AsyncAPISchemaAnyValueDeserializer.java (89%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/schema => schemas/jackson}/AsyncAPISchemaItemsDeserializer.java (89%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/schema => schemas/jackson}/JsonSchemaAnyValueDeserializer.java (88%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/schema => schemas/jackson}/JsonSchemaItemsDeserializer.java (88%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/schema => schemas/jackson}/JsonSchemaPropertiesDeserializer.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/schema => schemas/jackson}/SchemaAnyValueDeserializer.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/schema => schemas/jackson}/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/schema => schemas/jackson}/openapi/OpenAPISchemaAnyValueDeserializer.java (75%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java index 2494009a..f16ab125 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java @@ -1,9 +1,9 @@ package com.asyncapi.schemas; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; -import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAdditionalPropertiesDeserializer; -import com.asyncapi.v3.jackson.schema.AsyncAPISchemaAnyValueDeserializer; -import com.asyncapi.v3.jackson.schema.AsyncAPISchemaItemsDeserializer; +import com.asyncapi.schemas.jackson.AsyncAPISchemaAdditionalPropertiesDeserializer; +import com.asyncapi.schemas.jackson.AsyncAPISchemaAnyValueDeserializer; +import com.asyncapi.schemas.jackson.AsyncAPISchemaItemsDeserializer; import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java index f7e85865..54e08bfc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java @@ -1,8 +1,8 @@ package com.asyncapi.schemas; -import com.asyncapi.v3.jackson.schema.JsonSchemaAnyValueDeserializer; -import com.asyncapi.v3.jackson.schema.JsonSchemaItemsDeserializer; -import com.asyncapi.v3.jackson.schema.JsonSchemaPropertiesDeserializer; +import com.asyncapi.schemas.jackson.JsonSchemaAnyValueDeserializer; +import com.asyncapi.schemas.jackson.JsonSchemaItemsDeserializer; +import com.asyncapi.schemas.jackson.JsonSchemaPropertiesDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java index 1932c96b..db1ef15f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson.schema; +package com.asyncapi.schemas.jackson; import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java similarity index 89% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java index 8fe6962c..56bebfc4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson.schema; +package com.asyncapi.schemas.jackson; import com.asyncapi.schemas.AsyncAPISchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java similarity index 89% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java index 479da820..cda637d1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/AsyncAPISchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson.schema; +package com.asyncapi.schemas.jackson; import com.asyncapi.v3.jackson.SchemaItemsDeserializer; import com.asyncapi.schemas.AsyncAPISchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java similarity index 88% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java index 20176a57..70e8e1a2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson.schema; +package com.asyncapi.schemas.jackson; import com.asyncapi.schemas.JsonSchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java similarity index 88% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java index c9f2184e..94e92771 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson.schema; +package com.asyncapi.schemas.jackson; import com.asyncapi.v3.jackson.SchemaItemsDeserializer; import com.asyncapi.schemas.JsonSchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java index b83baeff..972bd1cb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/JsonSchemaPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson.schema; +package com.asyncapi.schemas.jackson; import com.asyncapi.schemas.JsonSchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/SchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/SchemaAnyValueDeserializer.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/SchemaAnyValueDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/SchemaAnyValueDeserializer.java index 8cb91a10..f691351a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/SchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/SchemaAnyValueDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson.schema; +package com.asyncapi.schemas.jackson; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java index 5c416bdf..43d025d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson.schema.openapi; +package com.asyncapi.schemas.jackson.openapi; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAnyValueDeserializer.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAnyValueDeserializer.java index 8ccb64f9..11c44c0b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAnyValueDeserializer.java @@ -1,6 +1,6 @@ -package com.asyncapi.v3.jackson.schema.openapi; +package com.asyncapi.schemas.jackson.openapi; -import com.asyncapi.v3.jackson.schema.SchemaAnyValueDeserializer; +import com.asyncapi.schemas.jackson.SchemaAnyValueDeserializer; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java index 173fc450..06b6e07c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.openapi.v3._0_0; -import com.asyncapi.v3.jackson.schema.openapi.OpenAPISchemaAdditionalPropertiesDeserializer; -import com.asyncapi.v3.jackson.schema.openapi.OpenAPISchemaAnyValueDeserializer; +import com.asyncapi.schemas.jackson.openapi.OpenAPISchemaAdditionalPropertiesDeserializer; +import com.asyncapi.schemas.jackson.openapi.OpenAPISchemaAnyValueDeserializer; import com.asyncapi.schemas.openapi.v3._0_0.properties.Discriminator; import com.asyncapi.schemas.openapi.v3._0_0.properties.Extensions; import com.asyncapi.schemas.openapi.v3._0_0.properties.ExternalDocumentation; From dffcae612cb1ca4187c34afb5f9b376370646439 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 02:07:49 +0400 Subject: [PATCH 076/141] feat(schemas): use AsyncAPISchema instead of Schema --- .../message/MessageHeadersDeserializer.java | 8 +- .../message/MessagePayloadDeserializer.java | 8 +- .../ComponentsSchemasDeserializer.java | 8 +- ...hemasAdditionalPropertiesDeserializer.java | 4 +- .../v2/_0_0/model/channel/Parameter.java | 4 +- .../_0_0/model/channel/message/Message.java | 6 +- .../model/channel/message/MessageTrait.java | 4 +- .../v2/_0_0/model/component/Components.java | 4 +- .../message/MessageHeadersDeserializer.java | 8 +- .../message/MessagePayloadDeserializer.java | 8 +- .../ComponentsSchemasDeserializer.java | 8 +- .../model/schema/SchemaDeserializer.java | 8 +- ...hemasAdditionalPropertiesDeserializer.java | 4 +- .../v2/_6_0/model/channel/Parameter.java | 2 +- .../_6_0/model/channel/message/Message.java | 6 +- .../model/channel/message/MessageTrait.java | 4 +- .../v2/_6_0/model/component/Components.java | 2 +- .../v2/jackson/SchemaItemsDeserializer.java | 10 +- .../java/com/asyncapi/v2/schema/Schema.java | 696 ------------------ .../java/com/asyncapi/v2/schema/Type.java | 18 - .../com/asyncapi/examples/v2/_0_0/AnyOf.kt | 16 +- .../examples/v2/_0_0/ApplicationHeaders.kt | 24 +- .../examples/v2/_0_0/CorrelationId.kt | 22 +- .../examples/v2/_0_0/GitterStreaming.kt | 73 +- .../com/asyncapi/examples/v2/_0_0/Mercure.kt | 16 +- .../com/asyncapi/examples/v2/_0_0/Not.kt | 10 +- .../com/asyncapi/examples/v2/_0_0/OneOf.kt | 22 +- .../examples/v2/_0_0/OperationSecurity.kt | 46 +- .../asyncapi/examples/v2/_0_0/RpcClient.kt | 14 +- .../asyncapi/examples/v2/_0_0/RpcServer.kt | 14 +- .../com/asyncapi/examples/v2/_0_0/Simple.kt | 8 +- .../com/asyncapi/examples/v2/_0_0/SlackRtm.kt | 530 ++++++------- .../examples/v2/_0_0/StreetlightsKafka.kt | 35 +- .../examples/v2/_0_0/StreetlightsMQTT.kt | 34 +- .../v2/_0_0/StreetlightsOperationSecurity.kt | 35 +- .../examples/v2/_0_0/WebsocketGemini.kt | 55 +- .../com/asyncapi/examples/v2/_6_0/AnyOf.kt | 16 +- .../examples/v2/_6_0/ApplicationHeaders.kt | 24 +- .../examples/v2/_6_0/CorrelationId.kt | 22 +- .../examples/v2/_6_0/GitterStreaming.kt | 73 +- .../com/asyncapi/examples/v2/_6_0/Mercure.kt | 16 +- .../com/asyncapi/examples/v2/_6_0/Not.kt | 10 +- .../com/asyncapi/examples/v2/_6_0/OneOf.kt | 24 +- .../examples/v2/_6_0/OperationSecurity.kt | 46 +- .../asyncapi/examples/v2/_6_0/RpcClient.kt | 14 +- .../asyncapi/examples/v2/_6_0/RpcServer.kt | 14 +- .../com/asyncapi/examples/v2/_6_0/Simple.kt | 8 +- .../com/asyncapi/examples/v2/_6_0/SlackRtm.kt | 530 ++++++------- .../examples/v2/_6_0/StreetlightsKafka.kt | 35 +- .../examples/v2/_6_0/StreetlightsMQTT.kt | 34 +- .../v2/_6_0/StreetlightsOperationSecurity.kt | 35 +- .../examples/v2/_6_0/WebsocketGemini.kt | 55 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../v2/_0_0/model/channel/ParameterTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 14 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../v2/_0_0/model/component/ComponentsTest.kt | 16 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../v2/_6_0/model/channel/ParameterTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 14 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../message/MessageWithArrayPayloadTest.kt | 10 +- .../v2/_6_0/model/component/ComponentsTest.kt | 16 +- .../v2/2.0.0/model/asyncapi - extended.json | 24 +- .../model/channel/channelItem - extended.json | 8 +- .../channel/message/message - extended.json | 8 +- .../message/messageTrait - extended.json | 8 +- .../operation with message - extended.json | 8 +- .../components/components - extended.json | 16 +- .../v2/2.6.0/model/asyncapi - extended.json | 48 +- .../model/channel/channelItem - extended.json | 16 +- .../channel/message/message - extended.json | 8 +- .../message/messageTrait - extended.json | 8 +- .../operation with message - extended.json | 8 +- ...eration with oneOf message - extended.json | 8 +- .../components/components - extended.json | 32 +- 76 files changed, 1155 insertions(+), 1877 deletions(-) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/schema/Type.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 27c6e0ec..99cb077b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; import com.asyncapi.schemas.Reference; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; /** @@ -9,11 +9,11 @@ * * @author Pavel Bodiachevskii */ -public class MessageHeadersDeserializer extends ReferenceOrObjectDeserializer { +public class MessageHeadersDeserializer extends ReferenceOrObjectDeserializer { @Override - public Class objectTypeClass() { - return Schema.class; + public Class objectTypeClass() { + return AsyncAPISchema.class; } public Class referenceClass() { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java index 8bba0769..bff68583 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v2.jackson.ObjectDeserializer; /** @@ -8,11 +8,11 @@ * * @author Pavel Bodiachevskii */ -public class MessagePayloadDeserializer extends ObjectDeserializer { +public class MessagePayloadDeserializer extends ObjectDeserializer { @Override - public Class objectTypeClass() { - return Schema.class; + public Class objectTypeClass() { + return AsyncAPISchema.class; } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index 17cca36a..8ead4abf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.jackson.model.component; import com.asyncapi.schemas.Reference; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; /** @@ -9,11 +9,11 @@ * * @author Pavel Bodiachevskii */ -public class ComponentsSchemasDeserializer extends MapOfReferencesOrObjectsDeserializer { +public class ComponentsSchemasDeserializer extends MapOfReferencesOrObjectsDeserializer { @Override - public Class objectTypeClass() { - return Schema.class; + public Class objectTypeClass() { + return AsyncAPISchema.class; } @Override diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java index 59ca2650..fb1a30a6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.schema; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; @@ -31,7 +31,7 @@ private Object chooseKnownPojo(JsonNode jsonNode, final ObjectCodec objectCodec) if (jsonNode.isBoolean()) { return jsonNode.asBoolean(); } else { - return jsonParser.readValueAs(Schema.class); + return jsonParser.readValueAs(AsyncAPISchema.class); } } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java index c6010dc5..e0165b44 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model.channel; import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -36,7 +36,7 @@ public class Parameter extends ExtendableObject { */ @JsonProperty @Nullable - private Schema schema; + private AsyncAPISchema schema; /** * A runtime expression that specifies the location of the parameter value. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java index cc339faa..7caebf5e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java @@ -8,7 +8,7 @@ import com.asyncapi.v2._0_0.model.ExternalDocumentation; import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.Tag; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.MessageBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,7 +43,7 @@ public class Message extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link Schema}
    • + *
  • {@link AsyncAPISchema}
    • *
  • {@link Reference}
    • *
*/ @@ -56,7 +56,7 @@ public class Message extends ExtendableObject { *

* WILL BE: *

    - *
  • {@link Schema}
    • + *
  • {@link AsyncAPISchema}
    • *
  • {@link com.fasterxml.jackson.databind.JsonNode}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java index 6f65e1fb..c7cf1e69 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java @@ -7,7 +7,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.MessageBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -47,7 +47,7 @@ public class MessageTrait extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link Schema}
    • + *
  • {@link AsyncAPISchema}
    • *
  • {@link Reference}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java index 2fe4593a..e0ecc9eb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java @@ -11,7 +11,7 @@ import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.OperationBinding; @@ -52,7 +52,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link Schema}
    • + *
  • {@link AsyncAPISchema}
    • *
  • {@link Reference}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 04178d4c..2c8fdafe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; import com.asyncapi.schemas.Reference; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; /** @@ -9,11 +9,11 @@ * * @author Pavel Bodiachevskii */ -public class MessageHeadersDeserializer extends ReferenceOrObjectDeserializer { +public class MessageHeadersDeserializer extends ReferenceOrObjectDeserializer { @Override - public Class objectTypeClass() { - return Schema.class; + public Class objectTypeClass() { + return AsyncAPISchema.class; } public Class referenceClass() { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java index f1cdec13..fedd9281 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v2.jackson.ObjectDeserializer; /** @@ -8,11 +8,11 @@ * * @author Pavel Bodiachevskii */ -public class MessagePayloadDeserializer extends ObjectDeserializer { +public class MessagePayloadDeserializer extends ObjectDeserializer { @Override - public Class objectTypeClass() { - return Schema.class; + public Class objectTypeClass() { + return AsyncAPISchema.class; } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java index ed17d558..000da053 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,14 +1,14 @@ package com.asyncapi.v2._6_0.jackson.model.component; import com.asyncapi.schemas.Reference; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; -public class ComponentsSchemasDeserializer extends MapOfReferencesOrObjectsDeserializer { +public class ComponentsSchemasDeserializer extends MapOfReferencesOrObjectsDeserializer { @Override - public Class objectTypeClass() { - return Schema.class; + public Class objectTypeClass() { + return AsyncAPISchema.class; } @Override diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java index 5d0d24e6..ac8af003 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.jackson.model.schema; import com.asyncapi.schemas.Reference; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; /** @@ -9,11 +9,11 @@ * * @author Pavel Bodiachevskii */ -public class SchemaDeserializer extends ReferenceOrObjectDeserializer { +public class SchemaDeserializer extends ReferenceOrObjectDeserializer { @Override - public Class objectTypeClass() { - return Schema.class; + public Class objectTypeClass() { + return AsyncAPISchema.class; } public Class referenceClass() { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java index 0f1cce06..2f7abe4b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.schema; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; @@ -31,7 +31,7 @@ private Object chooseKnownPojo(JsonNode jsonNode, final ObjectCodec objectCodec) if (jsonNode.isBoolean()) { return jsonNode.asBoolean(); } else { - return jsonParser.readValueAs(Schema.class); + return jsonParser.readValueAs(AsyncAPISchema.class); } } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java index d71e7e29..f2ab3d97 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java @@ -37,7 +37,7 @@ public class Parameter extends ExtendableObject { * MUST BE: *
    *
  • {@link Reference}
    • - *
  • {@link com.asyncapi.v2.schema.Schema}
    • + *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • *
*/ @Nullable diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java index 8af4209b..132e6fee 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java @@ -51,7 +51,7 @@ public class Message extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.v2.schema.Schema}
    • + *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • *
  • {@link Reference}
    • *
*/ @@ -66,7 +66,7 @@ public class Message extends ExtendableObject { *

* WILL BE: *

    - *
  • {@link com.asyncapi.v2.schema.Schema}
    • + *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • *
*/ @Nullable @@ -88,7 +88,7 @@ public class Message extends ExtendableObject { /** * A string containing the name of the schema format used to define the message payload. - * If omitted, implementations should parse the payload as a {@link com.asyncapi.v2.schema.Schema} object. When the payload is defined using a + * If omitted, implementations should parse the payload as a {@link com.asyncapi.schemas.AsyncAPISchema} object. When the payload is defined using a * $ref to a remote file, it is RECOMMENDED the schema format includes the file encoding type to allow implementations * to parse the file correctly. E.g., adding +yaml if content type is application/vnd.apache.avro results in * application/vnd.apache.avro+yaml. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java index e32670b8..465dbd00 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java @@ -55,7 +55,7 @@ public class MessageTrait extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.v2.schema.Schema}
    • + *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • *
  • {@link Reference}
    • *
*/ @@ -78,7 +78,7 @@ public class MessageTrait extends ExtendableObject { /** * A string containing the name of the schema format used to define the message payload. - * If omitted, implementations should parse the payload as a {@link com.asyncapi.v2.schema.Schema} object. When the payload is defined using a + * If omitted, implementations should parse the payload as a {@link com.asyncapi.schemas.AsyncAPISchema} object. When the payload is defined using a * $ref to a remote file, it is RECOMMENDED the schema format includes the file encoding type to allow implementations * to parse the file correctly. E.g., adding +yaml if content type is application/vnd.apache.avro results in * application/vnd.apache.avro+yaml. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index 6eb54a37..a92120f3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -52,7 +52,7 @@ public class Components extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.v2.schema.Schema}
    • + *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • *
  • {@link Reference}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java index 4b90358f..a4d3589e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.jackson; -import com.asyncapi.v2.schema.Schema; +import com.asyncapi.schemas.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; @@ -29,17 +29,17 @@ public Object deserialize(JsonParser jsonParser, DeserializationContext deserial return readAsObject(node, objectCodec); } - private List readAsListOfSchemas(ArrayNode arrayNode, ObjectCodec objectCodec) throws IOException { - List schemaList = new ArrayList<>(); + private List readAsListOfSchemas(ArrayNode arrayNode, ObjectCodec objectCodec) throws IOException { + List schemaList = new ArrayList<>(); for (JsonNode childNode : arrayNode) { schemaList.add(readAsSchema(childNode, objectCodec)); } return schemaList; } - private Schema readAsSchema(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { + private AsyncAPISchema readAsSchema(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { try (JsonParser parser = jsonNode.traverse(objectCodec)) { - return parser.readValueAs(Schema.class); + return parser.readValueAs(AsyncAPISchema.class); } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java b/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java deleted file mode 100644 index f7acdb78..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Schema.java +++ /dev/null @@ -1,696 +0,0 @@ -package com.asyncapi.v2.schema; - -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.v2._0_0.jackson.model.schema.SchemasAdditionalPropertiesDeserializer; -import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.v2.jackson.SchemaItemsDeserializer; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - -// TODO: Finish. Not all properties are present. -// TODO: Write tests - -/** - * The Schema Object allows the definition of input and output data types. These types can be objects, - * but also primitives and arrays. This object is a superset of the JSON Schema Specification Draft 07. - *
- * Further information about the properties can be found in JSON Schema Core and JSON Schema Validation. - * Unless stated otherwise, the property definitions follow the JSON Schema specification as referenced here. - *

- * The AsyncAPI Schema Object is a JSON Schema vocabulary which extends JSON Schema Core and Validation vocabularies. - * As such, any keyword available for those vocabularies is by definition available in AsyncAPI, and will work the - * exact same way, including but not limited to defined properties. - *

- * New properties may appear in this class after community requests. - * - * @see AnyncAPI Schema Object - * @author Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class Schema extends ExtendableObject { - - /* - Schema Annotations - - Schema validation is a useful mechanism for annotating instance data - with additional information. The rules for determining when and how - annotations are associated with an instance are outlined in section - 3.3. - - These general-purpose annotation keywords provide commonly used - information for documentation and user interface display purposes. - They are not intended to form a comprehensive set of features. - Rather, additional vocabularies can be defined for more complex - annotation-based applications. - */ - - /** - * The value of these keyword MUST be a string. - *

- * This keywords can be used to decorate a user interface with information about the data produced by this user - * interface. - *

- * A title will preferably be short - */ - @Nullable - @JsonProperty - public String title; - - /** - * The value of these keyword MUST be a string. - *

- * This property definition was adjusted to the AsyncAPI Specification. - * CommonMark syntax can be used for rich text representation. - *

- * This keywords can be used to decorate a user interface with information about the data produced by this user - * interface. - *

- * A description will provide explanation about the purpose of the instance described by this schema. - */ - @Nullable - @JsonProperty - public String description; - - /** - * There are no restrictions placed on the value of this keyword. When multiple occurrences of this keyword are - * applicable to a single sub-instance, implementations SHOULD remove duplicates. - *

- * This keyword can be used to supply a default JSON value associated with a particular schema. - * It is RECOMMENDED that a default value be valid against the associated schema. - *

- * This property definition was adjusted to the AsyncAPI Specification. - * The default value represents what would be assumed by the consumer of the input as the value of the schema if one - * is not provided. Unlike JSON Schema, the value MUST conform to the defined type for the Schema Object defined at - * the same level. For example, of type is string, then default can be "foo" but cannot be 1. - */ - @Nullable - @JsonProperty("default") - public Object defaultValue; - - /** - * The value of this keyword MUST be a boolean. When multiple occurrences of this keyword are applicable to a - * single sub-instance, the resulting value MUST be true if any occurrence specifies a true value, and MUST be false otherwise. - *

- * If "readOnly" has a value of boolean true, it indicates that the value of the instance is managed exclusively by the owning authority, - * and attempts by an application to modify the value of this property are expected to be ignored or rejected by that owning authority. - *

- * An instance document that is marked as "readOnly for the entire document MAY be ignored if sent to the owning authority, or MAY - * result in an error, at the authority's discretion. - *

- * For example, "readOnly" would be used to mark a database-generated serial number as read-only, while "writeOnly" would be used to mark a - * password input field. - *

- * This keyword can be used to assist in user interface instance generation. In particular, an application MAY choose to use a widget - * that hides input values as they are typed for write-only fields. - *

- * Omitting this keyword has the same behavior as values of false. - */ - @Nullable - @JsonProperty - public Boolean readOnly; - - /** - * The value of this keyword MUST be a boolean. When multiple occurrences of this keyword are applicable to a - * single sub-instance, the resulting value MUST be true if any occurrence specifies a true value, and MUST be false otherwise. - *

- * If "writeOnly" has a value of boolean true, it indicates that the value is never present when the instance is retrieved from the owning - * authority. It can be present when sent to the owning authority to update or create the document (or the resource it represents), but it - * will not be included in any updated or newly created version of the instance. - *

- * An instance document that is marked as "writeOnly" for the entire document MAY be returned as a blank document of some sort, or MAY - * produce an error upon retrieval, or have the retrieval request ignored, at the authority's discretion. - *

- * This keyword can be used to assist in user interface instance generation. In particular, an application MAY choose to use a widget - * that hides input values as they are typed for write-only fields. - *

- * Omitting this keyword has the same behavior as values of false. - */ - @Nullable - @JsonProperty - public Boolean writeOnly; - - /** - * The value of this keyword MUST be an array. There are no restrictions placed on the values within the array. - * When multiple occurrences of this keyword are applicable to a single sub-instance, implementations MUST provide - * a flat array of all values rather than an array of arrays. - *

- * This keyword can be used to provide sample JSON values associated with a particular schema, for the purpose of - * illustrating usage. It is RECOMMENDED that these values be valid against the associated schema. - *

- * Implementations MAY use the value(s) of "default", if present, as an additional example. If "examples" is absent, - * "default" MAY still be used in this manner. - */ - @Nullable - @JsonProperty - public List examples; - - @Nullable - @JsonProperty("$ref") - private String ref; - - /* - String-Encoding Non-JSON Data - - Foreword - - Properties defined in this section indicate that an instance contains - non-JSON data encoded in a JSON string. They describe the type of - content and how it is encoded. - - These properties provide additional information required to interpret - JSON data as rich multimedia documents. - - Implementation Requirements - - The content keywords function as both annotations (Section 3.3) and - as assertions (Section 3.2). While no special effort is required to - implement them as annotations conveying how applications can - interpret the data in the string, implementing validation of - conformance to the media type and encoding is non-trivial. - - Implementations MAY support the "contentMediaType" and - "contentEncoding" keywords as validation assertions. Should they - choose to do so, they SHOULD offer an option to disable validation - for these keywords. - */ - - /** - * If the instance value is a string, this property defines that the string SHOULD be interpreted as binary data and - * decoded using the encoding named by this property. RFC 2045, Sec 6.1 [RFC2045] lists the possible values for this property. - *

- * The value of this property MUST be a string. - *

- * The value of this property SHOULD be ignored if the instance described is not a string. - */ - @Nullable - @JsonProperty - private String contentEncoding; - - /** - * The value of this property must be a media type, as defined by RFC 2046 [RFC2046]. This property defines the media - * type of instances which this schema defines. - *

- * The value of this property MUST be a string. - *

- * The value of this property SHOULD be ignored if the instance described is not a string. - *

- * If the "contentEncoding" property is not present, but the instance value is a string, then the value of this property SHOULD specify a - * text document type, and the character set SHOULD be the character set into which the JSON string value was decoded (for which the default - * is Unicode). - */ - @Nullable - @JsonProperty - private String contentMediaType; - - /* - Validation. - */ - - /* - Validation Keywords for Any Instance Type - */ - - /** - * The value of this keyword MUST be either a string or an array. If it is an array, elements of the array MUST - * be strings and MUST be unique. - *
- * String values MUST be one of the six primitive types ("null", "boolean", "object", "array", "number", or "string"), - * or "integer" which matches any number with a zero fractional part. - *
- * An instance validates if and only if the instance is in any of the sets listed for this keyword. - * - */ - @Nullable - @JsonProperty - public Object type; - - /** - * The value of this keyword MUST be an array. This array SHOULD have at least one element. Elements in the array SHOULD be unique. - *
- * An instance validates successfully against this keyword if its value is equal to one of the elements in this keyword's array value. - *
- * Elements in the array might be of any value, including null. - */ - @Nullable - @JsonProperty("enum") - public List enumValue; - - /** - * The value of this keyword MAY be of any type, including null. - *
- * An instance validates successfully against this keyword if its value is equal to the value of the keyword. - */ - @Nullable - @JsonProperty("const") - public Object constValue; - - /* - Validation Keywords for Numeric Instances (number and integer) - */ - - /** - * The value of "multipleOf" MUST be a number, strictly greater than 0. - *
- * A numeric instance is valid only if division by this keyword's value results in an integer. - */ - @Nullable - @JsonProperty - public Number multipleOf; - - /** - * The value of "maximum" MUST be a number, representing an inclusive upper limit for a numeric instance. - *
- * If the instance is a number, then this keyword validates only if the instance is less than or exactly equal to "maximum". - */ - @Nullable - @JsonProperty - public BigDecimal maximum; - - /** - * The value of "exclusiveMaximum" MUST be number, representing an exclusive upper limit for a numeric instance. - *
- * If the instance is a number, then the instance is valid only if it has a value strictly less than (not equal to) "exclusiveMaximum". - */ - @Nullable - @JsonProperty - public BigDecimal exclusiveMaximum; - - /** - * The value of "minimum" MUST be a number, representing an inclusive lower limit for a numeric instance. - *
- * If the instance is a number, then this keyword validates only if the instance is greater than or exactly equal to "minimum". - */ - @Nullable - @JsonProperty - public BigDecimal minimum; - - /** - * The value of "exclusiveMinimum" MUST be number, representing an exclusive lower limit for a numeric instance. - *
- * If the instance is a number, then the instance is valid only if it has a value strictly greater than (not equal to) "exclusiveMinimum". - */ - @Nullable - @JsonProperty - public BigDecimal exclusiveMinimum; - - /* - Validation Keywords for Strings - */ - - /** - * The value of this keyword MUST be a non-negative integer. - *
- * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword. - *
- * The length of a string instance is defined as the number of its characters as defined by RFC 7159 [RFC7159]. - */ - @Nullable - @JsonProperty - public Integer maxLength; - - /** - * The value of this keyword MUST be a non-negative integer. - *
- * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword. - *
- * The length of a string instance is defined as the number of its characters as defined by RFC 7159 [RFC7159]. - *
- * Omitting this keyword has the same behavior as a value of 0. - */ - @Nullable - @JsonProperty - public Integer minLength; - - /** - * The value of this keyword MUST be a string. This string SHOULD be a valid regular expression, according - * to the ECMA 262 regular expression dialect. - *
- * A string instance is considered valid if the regular expression matches the instance successfully. - * Recall: regular expressions are not implicitly anchored. - */ - @Nullable - @JsonProperty - public String pattern; - - /* - Validation Keywords for Arrays - */ - - /** - * The value of "items" MUST be either a valid JSON Schema or an array of valid JSON Schemas. - *
- * This keyword determines how child instances validate for arrays, and does not directly validate the immediate instance itself. - *
- * If "items" is a schema, validation succeeds if all elements in the array successfully validate against that schema. - *
- * If "items" is an array of schemas, validation succeeds if each element of the instance validates against the schema at the same - * position, if any. - *
- * Omitting this keyword has the same behavior as an empty schema. - */ - @Nullable - @JsonDeserialize(using = SchemaItemsDeserializer.class) - public Object items; - - /** - * The value of "additionalItems" MUST be a valid JSON Schema. - *
- * This keyword determines how child instances validate for arrays, and does not directly validate the immediate instance itself. - *
- * If "items" is an array of schemas, validation succeeds if every instance element at a position greater than the size of "items" - * validates against "additionalItems". - *
- * Otherwise, "additionalItems" MUST be ignored, as the "items" schema (possibly the default value of an empty schema) is applied - * to all elements. - *
- * Omitting this keyword has the same behavior as an empty schema. - */ - @Nullable - public Schema additionalItems; - - /** - * The value of this keyword MUST be a non-negative integer. - *
- * An array instance is valid against "maxItems" if its size is less than, or equal to, the value of this keyword. - */ - @Nullable - @JsonProperty - public Integer maxItems; - - /** - * The value of this keyword MUST be a non-negative integer. - *
- * An array instance is valid against "minItems" if its size is greater than, or equal to, the value of this keyword. - *
- * Omitting this keyword has the same behavior as a value of 0. - */ - @Nullable - @JsonProperty - public Integer minItems; - - /** - * The value of this keyword MUST be a boolean. - *
- * If this keyword has boolean value false, the instance validates successfully. If it has boolean value true, - * the instance validates successfully if all of its elements are unique. - *
- * Omitting this keyword has the same behavior as a value of false. - */ - @Nullable - @JsonProperty - public Boolean uniqueItems; - - /** - * The value of this keyword MUST be a valid JSON Schema. - *
- * An array instance is valid against "contains" if at least one of its elements is valid against the given schema. - */ - @Nullable - @JsonProperty - public Schema contains; - - /* - Validation Keywords for Objects - */ - - /** - * The value of this keyword MUST be a non-negative integer. - *
- * An object instance is valid against "maxProperties" if its number of properties is less than, or equal to, - * the value of this keyword. - */ - @Nullable - @JsonProperty - public Integer maxProperties; - - /** - * The value of this keyword MUST be a non-negative integer. - *

- * An object instance is valid against "minProperties" if its number of properties is greater than, or equal to, - * the value of this keyword. - *

- * Omitting this keyword has the same behavior as a value of 0. - */ - @Nullable - @JsonProperty - public Integer minProperties; - - /** - * The value of this keyword MUST be an array. Elements of this array, if any, MUST be strings, and MUST be unique. - *

- * An object instance is valid against this keyword if every item in the array is the name of a property in the instance. - *

- * Omitting this keyword has the same behavior as an empty array. - */ - @Nullable - @JsonProperty - public List required; - - /** - * The value of "properties" MUST be an object. Each value of this object MUST be a valid JSON Schema. - *

- * This keyword determines how child instances validate for objects, and does not directly validate the immediate - * instance itself. - *

- * Validation succeeds if, for each name that appears in both the instance and as a name within this keyword's value, - * the child instance for that name successfully validates against the corresponding schema. - *

- * Omitting this keyword has the same behavior as an empty object. - */ - @Nullable - @JsonProperty - public Map properties; - - /** - * The value of "patternProperties" MUST be an object. Each property name of this object SHOULD be a valid regular - * expression, according to the ECMA 262 regular expression dialect. Each property value of this object MUST be a - * valid JSON Schema. - *

- * This keyword determines how child instances validate for objects, and does not directly validate the immediate - * instance itself. Validation of the primitive instance type against this keyword always succeeds. - *

- * Validation succeeds if, for each instance name that matches any regular expressions that appear as a property name - * in this keyword's value, the child instance for that name successfully validates against each schema that corresponds - * to a matching regular expression. - *

- * Omitting this keyword has the same behavior as an empty object. - */ - @Nullable - @JsonProperty - public Map patternProperties; - - /** - * The value of "additionalProperties" MUST be a valid JSON Schema. - *

- * This keyword determines how child instances validate for objects, and does not directly validate the immediate - * instance itself. - *

- * Validation with "additionalProperties" applies only to the child values of instance names that do not match any - * names in "properties", and do not match any regular expression in "patternProperties". - *

- * For all such properties, validation succeeds if the child instance validates against the "additionalProperties" schema. - *

- * Omitting this keyword has the same behavior as an empty schema. - */ - @Nullable - @JsonProperty - @JsonDeserialize(using = SchemasAdditionalPropertiesDeserializer.class) - public Object additionalProperties; - - /** - * [[CREF1: This keyword may be split into two, with the variation that uses an array of property names rather than a - * subschema getting a new name. The dual behavior is confusing and relatively difficult to implement. In the previous - * draft, we proposed dropping the keyword altogether, or dropping one of its forms, but we received feedback in support of - * keeping it. See issues #442 and #528 at https://github.com/json-schema-org/json-schema-spec/issues for further discussion. - * Further feedback is encouraged.]] - *

- * This keyword specifies rules that are evaluated if the instance is an object and contains a certain property. - *

- * This keyword's value MUST be an object. Each property specifies a dependency. Each dependency value MUST be an array - * or a valid JSON Schema. - *

- * If the dependency value is a subschema, and the dependency key is a property in the instance, the entire instance must validate - * against the dependency value. - *

- * If the dependency value is an array, each element in the array, if any, MUST be a string, and MUST be unique. If the dependency - * key is a property in the instance, each of the items in the dependency value must be a property that exists in the instance. - *

- * Omitting this keyword has the same behavior as an empty object. - */ - @Nullable - @JsonProperty - public Object dependencies; - - /** - * The value of "propertyNames" MUST be a valid JSON Schema. - *

- * If the instance is an object, this keyword validates if every property name in the instance validates against the provided schema. - * Note the property name that the schema is testing will always be a string. - *

- * Omitting this keyword has the same behavior as an empty schema. - */ - @Nullable - @JsonProperty - public Schema propertyNames; - - /* - Keywords for Applying Subschemas Conditionally - - These keywords work together to implement conditional application of - a subschema based on the outcome of another subschema. - - These keywords MUST NOT interact with each other across subschema - boundaries. In other words, an "if" in one branch of an "allOf" MUST - NOT have an impact on a "then" or "else" in another branch. - - There is no default behavior for any of these keywords when they are - not present. In particular, they MUST NOT be treated as if present - with an empty schema, and when "if" is not present, both "then" and - "else" MUST be entirely ignored. - */ - - /** - * This keyword's value MUST be a valid JSON Schema. - *

- * This validation outcome of this keyword's subschema has no direct effect on the overall validation result. - * Rather, it controls which of the "then" or "else" keywords are evaluated. - *

- * Instances that successfully validate against this keyword's subschema MUST also be valid against the subschema - * value of the "then" keyword, if present. - *

- * Instances that fail to validate against this keyword's subschema MUST also be valid against the subschema value of - * the "else" keyword, if present. - *

- * If annotations (Section 3.3) are being collected, they are collected from this keyword's subschema in the usual way, - * including when the keyword is present without either "then" or "else". - */ - @JsonProperty("if") - @Nullable - public Schema ifValue; - - /** - * This keyword's value MUST be a valid JSON Schema. - *

- * When "if" is present, and the instance successfully validates against its subschema, then valiation succeeds against - * this keyword if the instance also successfully validates against this keyword's subschema. - *

- * This keyword has no effect when "if" is absent, or when the instance fails to validate against its subschema. - * Implementations MUST NOT evaluate the instance against this keyword, for either validation or annotation collection - * purposes, in such cases. - */ - @JsonProperty("then") - @Nullable - public Schema thenValue; - - /** - * This keyword's value MUST be a valid JSON Schema. - *

- * When "if" is present, and the instance fails to validate against its subschema, then valiation succeeds against this - * keyword if the instance successfully validates against this keyword's subschema. - *

- * This keyword has no effect when "if" is absent, or when the instance successfully validates against its subschema. - * Implementations MUST NOT evaluate the instance against this keyword, for either validation or annotation collection - * purposes, in such cases. - */ - @JsonProperty("else") - @Nullable - public Schema elseValue; - - /* - Keywords for Applying Subschemas With Boolean Logic - */ - - /** - * This keyword's value MUST be a non-empty array. Each item of the array MUST be a valid JSON Schema. - *

- * An instance validates successfully against this keyword if it validates successfully against all schemas defined - * by this keyword's value. - */ - @Nullable - @JsonProperty - public List allOf; - - /** - * This keyword's value MUST be a non-empty array. Each item of the array MUST be a valid JSON Schema. - *

- * An instance validates successfully against this keyword if it validates successfully against at least one schema - * defined by this keyword's value. - */ - @Nullable - @JsonProperty - public List anyOf; - - /** - * This keyword's value MUST be a non-empty array. Each item of the array MUST be a valid JSON Schema. - *

- * An instance validates successfully against this keyword if it validates successfully against exactly one schema - * defined by this keyword's value. - */ - @Nullable - @JsonProperty - public List oneOf; - - /** - * This keyword's value MUST be a valid JSON Schema. - *

- * An instance is valid against this keyword if it fails to validate successfully against the schema defined by this keyword. - */ - @Nullable - @JsonProperty - public Schema not; - - // Fields defined in AsyncAPI below - - /* - The following properties are taken from the JSON Schema definition but their definitions were adjusted to the AsyncAPI Specification. - */ - /** - * See Data Type Formats for further details. - * While relying on JSON Schema's defined formats, the AsyncAPI Specification offers a few additional predefined formats. - */ - @Nullable - @JsonProperty - public Object format; - - /* - In addition to the JSON Schema fields, the following AsyncAPI vocabulary fields MAY be used for further schema documentation: - */ - /** - * Adds support for polymorphism. The discriminator is the schema property name that is used to differentiate between - * other schema that inherit this schema. - *

- * The property name used MUST be defined at this schema and it MUST be in the required property list. - * When used, the value MUST be the name of this schema or any schema that inherits it. See Composition and Inheritance for more details. - */ - @Nullable - @JsonProperty - public String discriminator; - /** - * Additional external documentation for this schema. - */ - @Nullable - @JsonProperty - public ExternalDocumentation externalDocs; - - /** - * Specifies that a schema is deprecated and SHOULD be transitioned out of usage. Default value is false. - */ - @Nullable - @JsonProperty - public Boolean deprecated; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Type.java b/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Type.java deleted file mode 100644 index 8b417e62..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/schema/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.asyncapi.v2.schema; - -/** - * Json Schema type. - * - * @author Pavel Bodiachevskii - */ -public class Type { - - public final static String NULL = "null"; - public final static String BOOLEAN = "boolean"; - public final static String OBJECT = "object"; - public final static String ARRAY = "array"; - public final static String NUMBER = "number"; - public final static String STRING = "string"; - public final static String INTEGER = "integer"; - -} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt index ad9d8750..c6b20a96 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class AnyOf: AbstractExampleValidationTest() { @@ -37,10 +37,10 @@ class AnyOf: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .anyOf(listOf( - Schema.builder().ref("#/components/schemas/objectWithKey").build(), - Schema.builder().ref("#/components/schemas/objectWithKey2").build(), + AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), + AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build(), )) .build() ) @@ -48,10 +48,10 @@ class AnyOf: AbstractExampleValidationTest() { ) )) .schemas(mapOf( - Pair("objectWithKey", Schema.builder() + Pair("objectWithKey", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key", Schema.builder() + Pair("key", AsyncAPISchema.builder() .type("string") .additionalProperties(false) .build() @@ -59,10 +59,10 @@ class AnyOf: AbstractExampleValidationTest() { )) .build() ), - Pair("objectWithKey2", Schema.builder() + Pair("objectWithKey2", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key2", Schema.builder() + Pair("key2", AsyncAPISchema.builder() .type("string") .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt index ef393d1d..5183c00f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt @@ -11,7 +11,7 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import java.math.BigDecimal class ApplicationHeaders: AbstractExampleValidationTest() { @@ -82,13 +82,13 @@ class ApplicationHeaders: AbstractExampleValidationTest() { "\$message.header#/MQMD/CorrelId" )) .contentType("application/json") - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("MQMD", Schema.builder() + Pair("MQMD", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("CorrelId", Schema.builder() + Pair("CorrelId", AsyncAPISchema.builder() .type("string") .minLength(24) .maxLength(24) @@ -98,41 +98,41 @@ class ApplicationHeaders: AbstractExampleValidationTest() { )) .build() ), - Pair("applicationInstanceId", Schema.builder() + Pair("applicationInstanceId", AsyncAPISchema.builder() .ref("#/components/schemas/applicationInstanceId") .build() ) )) .build() ) - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ) )) .schemas(mapOf( - Pair("lightMeasuredPayload", Schema.builder() + Pair("lightMeasuredPayload", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("lumens", Schema.builder() + Pair("lumens", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .ref("#/components/schemas/sentAt") .build() ) )) .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") .build() ), - Pair("applicationInstanceId", Schema.builder() + Pair("applicationInstanceId", AsyncAPISchema.builder() .type("string") .description("Unique identifier for a given instance of the publishing application") .build() @@ -141,7 +141,7 @@ class ApplicationHeaders: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt index 80953619..78b35275 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt @@ -11,7 +11,7 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme @@ -110,7 +110,7 @@ class CorrelationId: AbstractExampleValidationTest() { "\$message.header#/MQMD/CorrelId" )) .contentType("application/json") - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ), Pair("dimLight", Message.builder() @@ -118,44 +118,44 @@ class CorrelationId: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .correlationId(Reference("#/components/correlationIds/sentAtCorrelator")) - .payload(Schema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) .build() ) )) .schemas(mapOf( - Pair("lightMeasuredPayload", Schema.builder() + Pair("lightMeasuredPayload", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("lumens", Schema.builder() + Pair("lumens", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .ref("#/components/schemas/sentAt") .build() ) )) .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") .build() ), - Pair("dimLightPayload", Schema.builder() + Pair("dimLightPayload", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("percentage", Schema.builder() + Pair("percentage", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) .description("Percentage to which the light should be dimmed to.") .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .ref("#/components/schemas/sentAt") .build() ) @@ -166,7 +166,7 @@ class CorrelationId: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt index 2b56c430..cef78ce5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt @@ -10,9 +10,8 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding -import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme class GitterStreaming: AbstractExampleValidationTest() { @@ -47,7 +46,7 @@ class GitterStreaming: AbstractExampleValidationTest() { .parameters(mapOf( Pair("roomId", Parameter.builder() .description("Id of the Gitter room.") - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .examples(listOf("53307860c3599d1de448e19d")) .build() @@ -56,7 +55,7 @@ class GitterStreaming: AbstractExampleValidationTest() { ), Pair("resource", Parameter.builder() .description("The resource to consume.") - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .enumValue(listOf("chatMessages", "events")) .build() @@ -92,78 +91,78 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("chatMessage", Message.builder() .schemaFormat("application/schema+yaml;version=draft-07") .summary("A message represents an individual chat message sent to a room. They are a sub-resource of a room.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .description("ID of the message.") .build() ), - Pair("text", Schema.builder() + Pair("text", AsyncAPISchema.builder() .type("string") .description("Original message in plain-text/markdown.") .build() ), - Pair("html", Schema.builder() + Pair("html", AsyncAPISchema.builder() .type("string") .description("HTML formatted message.") .build() ), - Pair("sent", Schema.builder() + Pair("sent", AsyncAPISchema.builder() .type("string") .format("date-time") .description("ISO formatted date of the message.") .build() ), - Pair("fromUser", Schema.builder() + Pair("fromUser", AsyncAPISchema.builder() .type("object") .description("User that sent the message.") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .description("Gitter User ID.") .build() ), - Pair("username", Schema.builder() + Pair("username", AsyncAPISchema.builder() .type("string") .description("Gitter/GitHub username.") .build() ), - Pair("displayName", Schema.builder() + Pair("displayName", AsyncAPISchema.builder() .type("string") .description("Gitter/GitHub user real name.") .build() ), - Pair("url", Schema.builder() + Pair("url", AsyncAPISchema.builder() .type("string") .description("Path to the user on Gitter.") .build() ), - Pair("avatarUrl", Schema.builder() + Pair("avatarUrl", AsyncAPISchema.builder() .type("string") .format("uri") .description("User avatar URI.") .build() ), - Pair("avatarUrlSmall", Schema.builder() + Pair("avatarUrlSmall", AsyncAPISchema.builder() .type("string") .format("uri") .description("User avatar URI (small).") .build() ), - Pair("avatarUrlMedium", Schema.builder() + Pair("avatarUrlMedium", AsyncAPISchema.builder() .type("string") .format("uri") .description("User avatar URI (medium).") .build() ), - Pair("v", Schema.builder() + Pair("v", AsyncAPISchema.builder() .type("number") .description("Version.") .build() ), - Pair("gv", Schema.builder() + Pair("gv", AsyncAPISchema.builder() .type("string") .description("Stands for \"Gravatar version\" and is used for cache busting.") .build() @@ -171,42 +170,42 @@ class GitterStreaming: AbstractExampleValidationTest() { )) .build() ), - Pair("unread", Schema.builder() + Pair("unread", AsyncAPISchema.builder() .type("boolean") .description("Boolean that indicates if the current user has read the message.") .build() ), - Pair("readBy", Schema.builder() + Pair("readBy", AsyncAPISchema.builder() .type("number") .description("Number of users that have read the message.") .build() ), - Pair("urls", Schema.builder() + Pair("urls", AsyncAPISchema.builder() .type("array") .description("List of URLs present in the message.") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("string") .format("uri") .build()) .build() ), - Pair("mentions", Schema.builder() + Pair("mentions", AsyncAPISchema.builder() .type("array") .description("List of @Mentions in the message.") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("screenName", Schema.builder() + Pair("screenName", AsyncAPISchema.builder() .type("string") .build() ), - Pair("userId", Schema.builder() + Pair("userId", AsyncAPISchema.builder() .type("string") .build() ), - Pair("userIds", Schema.builder() + Pair("userIds", AsyncAPISchema.builder() .type("array") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("string") .build()) .build() @@ -215,29 +214,29 @@ class GitterStreaming: AbstractExampleValidationTest() { .build()) .build() ), - Pair("issues", Schema.builder() + Pair("issues", AsyncAPISchema.builder() .type("array") .description("List of #Issues referenced in the message.") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("number", Schema.builder().type("string").build()) + Pair("number", AsyncAPISchema.builder().type("string").build()) )) .build()) .build() ), - Pair("meta", Schema.builder() + Pair("meta", AsyncAPISchema.builder() .type("array") .description("Metadata. This is currently not used for anything.") - .items(Schema.builder().build()) + .items(AsyncAPISchema.builder().build()) .build() ), - Pair("v", Schema.builder() + Pair("v", AsyncAPISchema.builder() .type("number") .description("Version.") .build() ), - Pair("gv", Schema.builder() + Pair("gv", AsyncAPISchema.builder() .type("string") .description("Stands for \"Gravatar version\" and is used for cache busting.") .build() @@ -271,7 +270,7 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("heartbeat", Message.builder() .schemaFormat("application/schema+yaml;version=draft-07") .summary("Its purpose is to keep the connection alive.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("string") .enumValue(listOf("\r\n")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt index 4af6ad33..0c2c46e5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt @@ -9,7 +9,7 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class Mercure: AbstractExampleValidationTest() { @@ -41,7 +41,7 @@ class Mercure: AbstractExampleValidationTest() { .description("Every time a resource of type `http://schema.org/Book` is created or modified, a JSON-LD representation of the new version of this resource must be pushed in this Mercure topic.") .parameters(mapOf( Pair("id", Parameter.builder() - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("integer") .build() ) @@ -70,28 +70,28 @@ class Mercure: AbstractExampleValidationTest() { null, "https://schema.org/Book" )) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("@id", Schema.builder() + Pair("@id", AsyncAPISchema.builder() .type("string") .format("iri-reference") .build() ), - Pair("@type", Schema.builder() + Pair("@type", AsyncAPISchema.builder() .type("string") .format("iri-reference") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("isbn", Schema.builder() + Pair("isbn", AsyncAPISchema.builder() .type("string") .build() ), - Pair("abstract", Schema.builder() + Pair("abstract", AsyncAPISchema.builder() .type("string") .build() ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt index d66436a3..c550a7c3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class Not: AbstractExampleValidationTest() { @@ -37,16 +37,16 @@ class Not: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(Schema.builder().ref("#/components/schemas/testSchema").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/testSchema").build()) .build() ) )) .schemas(mapOf( - Pair("testSchema", Schema.builder() + Pair("testSchema", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key", Schema.builder() - .not(Schema.builder().type("integer").build()) + Pair("key", AsyncAPISchema.builder() + .not(AsyncAPISchema.builder().type("integer").build()) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt index 7f1fc44d..2c460fa9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class OneOf: AbstractExampleValidationTest() { @@ -34,7 +34,7 @@ class OneOf: AbstractExampleValidationTest() { .subscribe(Operation.builder() // TODO: add OneOfMessage to 2.0.0 .message(Message.builder() - .payload(Schema.builder().ref("#/components/schemas/objectWithKey").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build()) .build()) .build() ) @@ -47,39 +47,39 @@ class OneOf: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .oneOf(listOf( - Schema.builder().ref("#/components/schemas/objectWithKey").build(), - Schema.builder().ref("#/components/schemas/objectWithKey2").build() + AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), + AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build() )) .build() ) .build() ), Pair("testMessage1", Message.builder() - .payload(Schema.builder().ref("#/components/schemas/objectWithKey").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build()) .build() ), Pair("testMessage2", Message.builder() - .payload(Schema.builder().ref("#/components/schemas/objectWithKey2").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build()) .build() ) )) .schemas(mapOf( - Pair("objectWithKey", Schema.builder() + Pair("objectWithKey", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key", Schema.builder() + Pair("key", AsyncAPISchema.builder() .type("string") .build() ) )) .build() ), - Pair("objectWithKey2", Schema.builder() + Pair("objectWithKey2", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key2", Schema.builder() + Pair("key2", AsyncAPISchema.builder() .type("string") .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt index 83da8052..458e950a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow @@ -49,10 +49,10 @@ class OperationSecurity: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("message", Message.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("X-SIGNATURE", Schema.builder() + Pair("X-SIGNATURE", AsyncAPISchema.builder() .type("string") .description("ECC message signature") .build() @@ -60,14 +60,14 @@ class OperationSecurity: AbstractExampleValidationTest() { )) .build() ) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("metadata", Schema.builder() + Pair("metadata", AsyncAPISchema.builder() .ref("#/components/schemas/MetaData") .build() ), - Pair("notification", Schema.builder() + Pair("notification", AsyncAPISchema.builder() .ref("#/components/schemas/Notification") .build() ) @@ -78,20 +78,20 @@ class OperationSecurity: AbstractExampleValidationTest() { ) )) .schemas(mapOf( - Pair("MetaData", Schema.builder() + Pair("MetaData", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("topic", Schema.builder() + Pair("topic", AsyncAPISchema.builder() .type("string") .description("Topic subscribed to.") .build() ), - Pair("schemaVersion", Schema.builder() + Pair("schemaVersion", AsyncAPISchema.builder() .type("string") .description("The schema for this topic.") .build() ), - Pair("deprecated", Schema.builder() + Pair("deprecated", AsyncAPISchema.builder() .type("boolean") .description("If this is a deprecated schema or topic.") .defaultValue("false") @@ -100,61 +100,61 @@ class OperationSecurity: AbstractExampleValidationTest() { )) .build() ), - Pair("Notification", Schema.builder() + Pair("Notification", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("notificationId", Schema.builder() + Pair("notificationId", AsyncAPISchema.builder() .type("string") .description("The notification Id.") .build() ), - Pair("eventDate", Schema.builder() + Pair("eventDate", AsyncAPISchema.builder() .type("string") .description("The event date associated with this notification in UTC.") .build() ), - Pair("publishDate", Schema.builder() + Pair("publishDate", AsyncAPISchema.builder() .type("string") .description("The message publish date in UTC.") .build() ), - Pair("publishAttemptCount", Schema.builder() + Pair("publishAttemptCount", AsyncAPISchema.builder() .type("integer") .description("The number of attempts made to publish this message.") .build() ), - Pair("publishAttemptCount", Schema.builder() + Pair("publishAttemptCount", AsyncAPISchema.builder() .type("integer") .description("The number of attempts made to publish this message.") .build() ), - Pair("data", Schema.builder() + Pair("data", AsyncAPISchema.builder() .ref("#/components/schemas/AuthorizationRevocationData") .build() ) )) .build() ), - Pair("AuthorizationRevocationData", Schema.builder() + Pair("AuthorizationRevocationData", AsyncAPISchema.builder() .type("object") .description("The Authorization Revocation payload.") .properties(mapOf( - Pair("username", Schema.builder() + Pair("username", AsyncAPISchema.builder() .type("string") .description("The username for the user.") .build() ), - Pair("userId", Schema.builder() + Pair("userId", AsyncAPISchema.builder() .type("string") .description("The immutable public userId for the user") .build() ), - Pair("eiasToken", Schema.builder() + Pair("eiasToken", AsyncAPISchema.builder() .type("string") .description("The legacy eiasToken specific to the user") .build() ), - Pair("revokeReason", Schema.builder() + Pair("revokeReason", AsyncAPISchema.builder() .type("string") .enumValue(listOf( "REVOKED_BY_APP", @@ -165,7 +165,7 @@ class OperationSecurity: AbstractExampleValidationTest() { .description("The reason for authorization revocation") .build() ), - Pair("revocationDate", Schema.builder() + Pair("revocationDate", AsyncAPISchema.builder() .type("string") .description("Date and time when the authorization was revoked") .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt index f406d78b..51359205 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class RpcClient: AbstractExampleValidationTest() { @@ -46,7 +46,7 @@ class RpcClient: AbstractExampleValidationTest() { Pair("{queue}", ChannelItem.builder() .parameters(mapOf( Pair("queue", Parameter.builder() - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .pattern("^amq\\\\.gen\\\\-.+\$") .build()) @@ -73,10 +73,10 @@ class RpcClient: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("result", Schema.builder() + Pair("result", AsyncAPISchema.builder() .type("number") .examples(listOf(7)) .build()) @@ -110,12 +110,12 @@ class RpcClient: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("numbers", Schema.builder() + Pair("numbers", AsyncAPISchema.builder() .type("array") - .items(Schema.builder().type("number").build()) + .items(AsyncAPISchema.builder().type("number").build()) .examples(listOf(listOf(4, 3))) .build()) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt index 7f266767..a0f0a105 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class RpcServer: AbstractExampleValidationTest() { @@ -46,7 +46,7 @@ class RpcServer: AbstractExampleValidationTest() { Pair("{queue}", ChannelItem.builder() .parameters(mapOf( Pair("queue", Parameter.builder() - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .pattern("^amq\\\\.gen\\\\-.+\$") .build()) @@ -73,10 +73,10 @@ class RpcServer: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("result", Schema.builder() + Pair("result", AsyncAPISchema.builder() .type("number") .examples(listOf(7)) .build()) @@ -104,12 +104,12 @@ class RpcServer: AbstractExampleValidationTest() { .operationId("sum") .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("numbers", Schema.builder() + Pair("numbers", AsyncAPISchema.builder() .type("array") - .items(Schema.builder().type("number").build()) + .items(AsyncAPISchema.builder().type("number").build()) .examples(listOf(listOf(4, 3))) .build()) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt index 11ffe9ea..d80881a8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class Simple: AbstractExampleValidationTest() { @@ -38,15 +38,15 @@ class Simple: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("UserSignedUp", Message.builder() - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("displayName", Schema.builder() + Pair("displayName", AsyncAPISchema.builder() .type("string") .description("Name of the user") .build() ), - Pair("email", Schema.builder() + Pair("email", AsyncAPISchema.builder() .type("string") .format("email") .description("Email of the user") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt index 62218061..9de4c6b4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.http.HttpApiKeySecurityScheme class SlackRtm: AbstractExampleValidationTest() { @@ -67,62 +67,62 @@ class SlackRtm: AbstractExampleValidationTest() { )) .schemas(mapOf( Pair("attachment", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("fallback", Schema.builder() + Pair("fallback", AsyncAPISchema.builder() .type("string") .build() ), - Pair("color", Schema.builder() + Pair("color", AsyncAPISchema.builder() .type("string") .build() ), - Pair("pretext", Schema.builder() + Pair("pretext", AsyncAPISchema.builder() .type("string") .build() ), - Pair("author_name", Schema.builder() + Pair("author_name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("author_link", Schema.builder() + Pair("author_link", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("author_icon", Schema.builder() + Pair("author_icon", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("title", Schema.builder() + Pair("title", AsyncAPISchema.builder() .type("string") .build() ), - Pair("title_link", Schema.builder() + Pair("title_link", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("text", Schema.builder() + Pair("text", AsyncAPISchema.builder() .type("string") .build() ), - Pair("fields", Schema.builder() + Pair("fields", AsyncAPISchema.builder() .type("array") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("title", Schema.builder() + Pair("title", AsyncAPISchema.builder() .type("string") .build() ), - Pair("value", Schema.builder() + Pair("value", AsyncAPISchema.builder() .type("string") .build() ), - Pair("short", Schema.builder() + Pair("short", AsyncAPISchema.builder() .type("boolean") .build() ), @@ -131,26 +131,26 @@ class SlackRtm: AbstractExampleValidationTest() { ) .build() ), - Pair("image_url", Schema.builder() + Pair("image_url", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("thumb_url", Schema.builder() + Pair("thumb_url", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("footer", Schema.builder() + Pair("footer", AsyncAPISchema.builder() .type("string") .build() ), - Pair("footer_icon", Schema.builder() + Pair("footer_icon", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("number") .build() ), @@ -162,10 +162,10 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("hello", Message.builder() .summary("First event received upon connection.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("hello")) .build() @@ -178,19 +178,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("connectionError", Message.builder() .summary("Event received when a connection error happens.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("error")) .build() ), - Pair("error", Schema.builder() + Pair("error", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("code", Schema.builder().type("number").build()), - Pair("msg", Schema.builder().type("string").build()), + Pair("code", AsyncAPISchema.builder().type("number").build()), + Pair("msg", AsyncAPISchema.builder().type("string").build()), )) .build() ) @@ -202,10 +202,10 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("accountsChanged", Message.builder() .summary("The list of accounts a user is signed into has changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("accounts_changed")) .build() @@ -218,32 +218,32 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("botAdded", Message.builder() .summary("A bot user was added.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("bot_added")) .build() ), - Pair("bot", Schema.builder() + Pair("bot", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("app_id", Schema.builder() + Pair("app_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("icons", Schema.builder() + Pair("icons", AsyncAPISchema.builder() .type("object") - .additionalProperties(Schema.builder().type("string").build()) + .additionalProperties(AsyncAPISchema.builder().type("string").build()) .build() ) )) @@ -257,32 +257,32 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("botChanged", Message.builder() .summary("A bot user was changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("bot_added")) .build() ), - Pair("bot", Schema.builder() + Pair("bot", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("app_id", Schema.builder() + Pair("app_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("icons", Schema.builder() + Pair("icons", AsyncAPISchema.builder() .type("object") - .additionalProperties(Schema.builder().type("string").build()) + .additionalProperties(AsyncAPISchema.builder().type("string").build()) .build() ) )) @@ -296,19 +296,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelArchive", Message.builder() .summary("A channel was archived.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_archive")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -320,30 +320,30 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelCreated", Message.builder() .summary("A channel was created.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_created")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), - Pair("creator", Schema.builder() + Pair("creator", AsyncAPISchema.builder() .type("string") .build() ) @@ -358,15 +358,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelDeleted", Message.builder() .summary("A channel was deleted.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_deleted")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ) @@ -378,23 +378,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelHistoryChanged", Message.builder() .summary("Bulk updates were made to a channel's history.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_history_changed")) .build() ), - Pair("latest", Schema.builder() + Pair("latest", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ) @@ -406,30 +406,30 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelJoined", Message.builder() .summary("You joined a channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_joined")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), - Pair("creator", Schema.builder() + Pair("creator", AsyncAPISchema.builder() .type("string") .build() ) @@ -444,15 +444,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelLeft", Message.builder() .summary("You left a channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_left")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ) @@ -464,19 +464,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelMarked", Message.builder() .summary("Your channel read marker was updated.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_marked")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ) @@ -488,26 +488,26 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelRename", Message.builder() .summary("A channel was renamed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_rename")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ) @@ -522,19 +522,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelUnarchive", Message.builder() .summary("A channel was unarchived.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_unarchive")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -546,15 +546,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("commandsChanged", Message.builder() .summary("A slash command has been added or changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("commands_changed")) .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ) @@ -566,38 +566,38 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("dndUpdated", Message.builder() .summary("Do not Disturb settings changed for the current user.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("dnd_updated")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("dnd_status", Schema.builder() + Pair("dnd_status", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("dnd_enabled", Schema.builder() + Pair("dnd_enabled", AsyncAPISchema.builder() .type("boolean") .build() ), - Pair("next_dnd_start_ts", Schema.builder() + Pair("next_dnd_start_ts", AsyncAPISchema.builder() .type("number") .build() ), - Pair("next_dnd_end_ts", Schema.builder() + Pair("next_dnd_end_ts", AsyncAPISchema.builder() .type("number") .build() ), - Pair("snooze_enabled", Schema.builder() + Pair("snooze_enabled", AsyncAPISchema.builder() .type("boolean") .build() ), - Pair("snooze_endtime", Schema.builder() + Pair("snooze_endtime", AsyncAPISchema.builder() .type("number") .build() ) @@ -612,30 +612,30 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("dndUpdatedUser", Message.builder() .summary("Do not Disturb settings changed for a member.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("dnd_updated_user")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("dnd_status", Schema.builder() + Pair("dnd_status", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("dnd_enabled", Schema.builder() + Pair("dnd_enabled", AsyncAPISchema.builder() .type("boolean") .build() ), - Pair("next_dnd_start_ts", Schema.builder() + Pair("next_dnd_start_ts", AsyncAPISchema.builder() .type("number") .build() ), - Pair("next_dnd_end_ts", Schema.builder() + Pair("next_dnd_end_ts", AsyncAPISchema.builder() .type("number") .build() ) @@ -650,19 +650,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emailDomainChanged", Message.builder() .summary("The workspace email domain has changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("email_domain_changed")) .build() ), - Pair("email_domain", Schema.builder() + Pair("email_domain", AsyncAPISchema.builder() .type("string") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -674,25 +674,25 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emojiRemoved", Message.builder() .summary("A custom emoji has been removed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("emoji_changed")) .build() ), - Pair("subtype", Schema.builder() + Pair("subtype", AsyncAPISchema.builder() .type("string") .enumValue(listOf("remove")) .build() ), - Pair("names", Schema.builder() + Pair("names", AsyncAPISchema.builder() .type("array") - .items(Schema.builder().type("string").build()) + .items(AsyncAPISchema.builder().type("string").build()) .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -704,29 +704,29 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emojiAdded", Message.builder() .summary("A custom emoji has been added.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("emoji_changed")) .build() ), - Pair("subtype", Schema.builder() + Pair("subtype", AsyncAPISchema.builder() .type("string") .enumValue(listOf("add")) .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("value", Schema.builder() + Pair("value", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -738,22 +738,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileChange", Message.builder() .summary("A file was changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_change")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -765,23 +765,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentAdded", Message.builder() .summary("A file comment was added.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_comment_added")) .build() ), - Pair("comment", Schema()), - Pair("file_id", Schema.builder() + Pair("comment", AsyncAPISchema()), + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -793,26 +793,26 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentDeleted", Message.builder() .summary("A file comment was deleted.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_comment_deleted")) .build() ), - Pair("comment", Schema.builder() + Pair("comment", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -824,23 +824,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentEdited", Message.builder() .summary("A file comment was edited.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_comment_edited")) .build() ), - Pair("comment", Schema()), - Pair("file_id", Schema.builder() + Pair("comment", AsyncAPISchema()), + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -852,22 +852,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCreated", Message.builder() .summary("A file was created.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_created")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -879,19 +879,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileDeleted", Message.builder() .summary("A file was deleted.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_deleted")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -903,22 +903,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("filePublic", Message.builder() .summary("A file was made public.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_public")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -930,22 +930,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileShared", Message.builder() .summary("A file was shared.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_shared")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -957,22 +957,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileUnshared", Message.builder() .summary("A file was unshared.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_unshared")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -984,10 +984,10 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("goodbye", Message.builder() .summary("The server intends to close the connection soon.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("goodbye")) .build() @@ -1000,15 +1000,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupArchive", Message.builder() .summary("A private channel was archived.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_archive")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), @@ -1020,19 +1020,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupClose", Message.builder() .summary("You closed a private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_close")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), @@ -1044,23 +1044,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupHistoryChanged", Message.builder() .summary("Bulk updates were made to a private channel's history.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_history_changed")) .build() ), - Pair("latest", Schema.builder() + Pair("latest", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -1072,30 +1072,30 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupJoined", Message.builder() .summary("You joined a private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_joined")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), - Pair("creator", Schema.builder() + Pair("creator", AsyncAPISchema.builder() .type("string") .build() ), @@ -1110,15 +1110,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupLeft", Message.builder() .summary("You left a private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_left")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), @@ -1130,19 +1130,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupMarked", Message.builder() .summary("A private channel read marker was updated.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_marked")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -1154,19 +1154,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupOpen", Message.builder() .summary("You opened a private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_open")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1178,26 +1178,26 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupRename", Message.builder() .summary("A private channel was renamed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_rename")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), @@ -1212,19 +1212,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupUnarchive", Message.builder() .summary("A private channel was unarchived.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_unarchive")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1236,19 +1236,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imClose", Message.builder() .summary("You closed a DM.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("im_close")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1260,37 +1260,37 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imCreated", Message.builder() .summary("A DM was created.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("im_created")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), - Pair("creator", Schema.builder() + Pair("creator", AsyncAPISchema.builder() .type("string") .build() ), )) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1302,19 +1302,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imMarked", Message.builder() .summary("A direct message read marker was updated.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("im_marked")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -1326,19 +1326,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imOpen", Message.builder() .summary("You opened a DM.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("im_open")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1350,15 +1350,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("manualPresenceChange", Message.builder() .summary("You manually updated your presence.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("manual_presence_change")) .build() ), - Pair("presence", Schema.builder() + Pair("presence", AsyncAPISchema.builder() .type("string") .build() ), @@ -1370,32 +1370,32 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("memberJoinedChannel", Message.builder() .summary("A user joined a public or private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("member_joined_channel")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel_type", Schema.builder() + Pair("channel_type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("C", "G")) .build() ), - Pair("team", Schema.builder() + Pair("team", AsyncAPISchema.builder() .type("string") .build() ), - Pair("inviter", Schema.builder() + Pair("inviter", AsyncAPISchema.builder() .type("string") .build() ), @@ -1407,28 +1407,28 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("memberLeftChannel", Message.builder() .summary("A user left a public or private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("member_left_channel")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel_type", Schema.builder() + Pair("channel_type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("C", "G")) .build() ), - Pair("team", Schema.builder() + Pair("team", AsyncAPISchema.builder() .type("string") .build() ), @@ -1440,43 +1440,43 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("message", Message.builder() .summary("A message was sent to a channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("message")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("text", Schema.builder() + Pair("text", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), - Pair("attachments", Schema.builder() + Pair("attachments", AsyncAPISchema.builder() .type("array") - .items(Schema.builder().ref("#/components/schemas/attachment").build()) + .items(AsyncAPISchema.builder().ref("#/components/schemas/attachment").build()) .build() ), - Pair("edited", Schema.builder() + Pair("edited", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ) @@ -1491,23 +1491,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("outgoingMessage", Message.builder() .summary("A message was sent to a channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("message")) .build() ), - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("number") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("text", Schema.builder() + Pair("text", AsyncAPISchema.builder() .type("string") .build() ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt index d90dd427..7f6dff1d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt @@ -12,9 +12,8 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.security_scheme.SecurityScheme import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.v2.security_scheme.SecurityScheme import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -126,7 +125,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .contentType("application/json") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ), Pair("turnOnOff", @@ -135,7 +134,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .title("Turn on/off") .summary("Command a particular streetlight to turn the lights on or off.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/turnOnOffPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/turnOnOffPayload").build()) .build() ), Pair("dimLight", @@ -144,51 +143,51 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) .build() ) )) .schemas(mapOf( Pair("lightMeasuredPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("lumens", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("turnOnOffPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("command", - Schema.builder() + AsyncAPISchema.builder() .type("string") .enumValue(listOf("on", "off")) .description("Whether to turn on or off the light.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("dimLightPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("percentage", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) @@ -196,13 +195,13 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("sentAt", - Schema.builder() + AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") @@ -226,17 +225,17 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("my-app-header", Schema.builder() + Pair("my-app-header", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt index 4ef375ec..7c69bf10 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt @@ -13,7 +13,7 @@ import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme @@ -140,7 +140,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .contentType("application/json") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ), Pair("turnOnOff", @@ -149,7 +149,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .title("Turn on/off") .summary("Command a particular streetlight to turn the lights on or off.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/turnOnOffPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/turnOnOffPayload").build()) .build() ), Pair("dimLight", @@ -158,51 +158,51 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) .build() ) )) .schemas(mapOf( Pair("lightMeasuredPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("lumens", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("turnOnOffPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("command", - Schema.builder() + AsyncAPISchema.builder() .type("string") .enumValue(listOf("on", "off")) .description("Whether to turn on or off the light.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("dimLightPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("percentage", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) @@ -210,13 +210,13 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("sentAt", - Schema.builder() + AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") @@ -276,17 +276,17 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("my-app-header", Schema.builder() + Pair("my-app-header", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt index f064e10b..f0c447de 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt @@ -12,12 +12,11 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.AsyncAPISchema import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -134,7 +133,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .contentType("application/json") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ), Pair("turnOnOff", @@ -143,7 +142,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .title("Turn on/off") .summary("Command a particular streetlight to turn the lights on or off.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/turnOnOffPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/turnOnOffPayload").build()) .build() ), Pair("dimLight", @@ -152,51 +151,51 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) .build() ) )) .schemas(mapOf( Pair("lightMeasuredPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("lumens", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("turnOnOffPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("command", - Schema.builder() + AsyncAPISchema.builder() .type("string") .enumValue(listOf("on", "off")) .description("Whether to turn on or off the light.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("dimLightPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("percentage", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) @@ -204,13 +203,13 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("sentAt", - Schema.builder() + AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") @@ -246,17 +245,17 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("my-app-header", Schema.builder() + Pair("my-app-header", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt index bb75e7e1..66f54de1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt @@ -10,7 +10,6 @@ import com.asyncapi.v2._0_0.model.info.Contact import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding -import com.asyncapi.v2.schema.Schema import com.asyncapi.schemas.AsyncAPISchema class WebsocketGemini: AbstractExampleValidationTest() { @@ -52,7 +51,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { mapOf( Pair("symbol", Parameter.builder() - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .enumValue(listOf( "btcusd", @@ -222,7 +221,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { .description( "The initial response message will show the existing state of the order book. Subsequent messages will show all executed trades, as well as all other changes to the order book from orders placed or canceled.\n" ) - .payload(Schema.builder().ref("#/components/schemas/market").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/market").build()) .examples(listOf( mapOf( Pair("name", "updateMessage"), @@ -256,34 +255,34 @@ class WebsocketGemini: AbstractExampleValidationTest() { ) )) .schemas(mapOf( - Pair("market", Schema.builder() + Pair("market", AsyncAPISchema.builder() .type("object") .oneOf(listOf( - Schema.builder().ref("#/components/schemas/heartbeat").build(), - Schema.builder().ref("#/components/schemas/update").build(), + AsyncAPISchema.builder().ref("#/components/schemas/heartbeat").build(), + AsyncAPISchema.builder().ref("#/components/schemas/update").build(), )) .build() ), - Pair("heartbeat", Schema.builder() + Pair("heartbeat", AsyncAPISchema.builder() .allOf(listOf( - Schema.builder() + AsyncAPISchema.builder() .properties(mapOf( - Pair("type", Schema.builder().type("string").constValue("heartbeat").build()) + Pair("type", AsyncAPISchema.builder().type("string").constValue("heartbeat").build()) )) .required(listOf("type")) .build(), - Schema.builder() + AsyncAPISchema.builder() .ref("#/components/schemas/default") .build(), )) .build() ), - Pair("update", Schema.builder() + Pair("update", AsyncAPISchema.builder() .allOf(listOf( - Schema.builder() + AsyncAPISchema.builder() .properties(mapOf( - Pair("type", Schema.builder().type("string").constValue("update").build()), - Pair("eventId", Schema.builder() + Pair("type", AsyncAPISchema.builder().type("string").constValue("update").build()), + Pair("eventId", AsyncAPISchema.builder() .type("integer") .description( "A monotonically increasing sequence number indicating when this " + @@ -292,8 +291,8 @@ class WebsocketGemini: AbstractExampleValidationTest() { ) .build() ), - Pair("events", Schema.builder().ref("#/components/schemas/events").build()), - Pair("timestamp", Schema.builder() + Pair("events", AsyncAPISchema.builder().ref("#/components/schemas/events").build()), + Pair("timestamp", AsyncAPISchema.builder() .type("number") .description( "The timestamp in seconds for this group of events (included for " + @@ -302,7 +301,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ) .build() ), - Pair("timestampms", Schema.builder() + Pair("timestampms", AsyncAPISchema.builder() .type("number") .description("The timestamp in milliseconds for this group of events.") .build() @@ -310,18 +309,18 @@ class WebsocketGemini: AbstractExampleValidationTest() { )) .required(listOf("type", "eventId", "events", "timestamp", "timestampms")) .build(), - Schema.builder().ref("#/components/schemas/default").build(), + AsyncAPISchema.builder().ref("#/components/schemas/default").build(), )) .build() ), - Pair("default", Schema.builder() + Pair("default", AsyncAPISchema.builder() .type("object") .description( "This object is always part of the payload. In case of type=heartbeat, " + "these are the only fields.") .required(listOf("type", "socket_sequence")) .properties(mapOf( - Pair("socket_sequence", Schema.builder() + Pair("socket_sequence", AsyncAPISchema.builder() .type("integer") .description( "zero-indexed monotonic increasing sequence number attached to each " + @@ -336,30 +335,30 @@ class WebsocketGemini: AbstractExampleValidationTest() { )) .build() ), - Pair("events", Schema.builder() + Pair("events", AsyncAPISchema.builder() .type("array") .description("Either a change to the order book, or the indication that a trade has occurred.") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("object") .additionalProperties(false) .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("trade", "change", "auction, block_trade")) .build() ), - Pair("price", Schema.builder() + Pair("price", AsyncAPISchema.builder() .type("number") .multipleOf(0.01) .description("The price of this order book entry.") .build() ), - Pair("side", Schema.builder() + Pair("side", AsyncAPISchema.builder() .type("string") .enumValue(listOf("bid", "side")) .build() ), - Pair("reason", Schema.builder() + Pair("reason", AsyncAPISchema.builder() .type("string") .enumValue(listOf("place", "trade", "cancel", "initial")) .description( @@ -369,14 +368,14 @@ class WebsocketGemini: AbstractExampleValidationTest() { ) .build() ), - Pair("remaining", Schema.builder() + Pair("remaining", AsyncAPISchema.builder() .type("number") .description( "The quantity remaining at that price level after this change occurred. May be zero if all orders at this price level have been filled or canceled." ) .build() ), - Pair("delta", Schema.builder() + Pair("delta", AsyncAPISchema.builder() .type("number") .description( "The quantity changed. May be negative, if an order is filled or canceled. For initial messages, delta will equal remaining." diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt index 3afe3155..5924dcba 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class AnyOf: AbstractExampleValidationTest() { @@ -37,10 +37,10 @@ class AnyOf: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .anyOf(listOf( - Schema.builder().ref("#/components/schemas/objectWithKey").build(), - Schema.builder().ref("#/components/schemas/objectWithKey2").build(), + AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), + AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build(), )) .build() ) @@ -48,10 +48,10 @@ class AnyOf: AbstractExampleValidationTest() { ) )) .schemas(mapOf( - Pair("objectWithKey", Schema.builder() + Pair("objectWithKey", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key", Schema.builder() + Pair("key", AsyncAPISchema.builder() .type("string") .additionalProperties(false) .build() @@ -59,10 +59,10 @@ class AnyOf: AbstractExampleValidationTest() { )) .build() ), - Pair("objectWithKey2", Schema.builder() + Pair("objectWithKey2", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key2", Schema.builder() + Pair("key2", AsyncAPISchema.builder() .type("string") .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt index c12a4078..5301d09c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt @@ -11,7 +11,7 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import java.math.BigDecimal class ApplicationHeaders: AbstractExampleValidationTest() { @@ -82,13 +82,13 @@ class ApplicationHeaders: AbstractExampleValidationTest() { "\$message.header#/MQMD/CorrelId" )) .contentType("application/json") - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("MQMD", Schema.builder() + Pair("MQMD", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("CorrelId", Schema.builder() + Pair("CorrelId", AsyncAPISchema.builder() .type("string") .minLength(24) .maxLength(24) @@ -98,41 +98,41 @@ class ApplicationHeaders: AbstractExampleValidationTest() { )) .build() ), - Pair("applicationInstanceId", Schema.builder() + Pair("applicationInstanceId", AsyncAPISchema.builder() .ref("#/components/schemas/applicationInstanceId") .build() ) )) .build() ) - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ) )) .schemas(mapOf( - Pair("lightMeasuredPayload", Schema.builder() + Pair("lightMeasuredPayload", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("lumens", Schema.builder() + Pair("lumens", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .ref("#/components/schemas/sentAt") .build() ) )) .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") .build() ), - Pair("applicationInstanceId", Schema.builder() + Pair("applicationInstanceId", AsyncAPISchema.builder() .type("string") .description("Unique identifier for a given instance of the publishing application") .build() @@ -141,7 +141,7 @@ class ApplicationHeaders: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt index dda4e41e..ccd5a5a3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt @@ -11,7 +11,7 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme @@ -110,7 +110,7 @@ class CorrelationId: AbstractExampleValidationTest() { "\$message.header#/MQMD/CorrelId" )) .contentType("application/json") - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ), Pair("dimLight", Message.builder() @@ -118,44 +118,44 @@ class CorrelationId: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .correlationId(Reference("#/components/correlationIds/sentAtCorrelator")) - .payload(Schema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) .build() ) )) .schemas(mapOf( - Pair("lightMeasuredPayload", Schema.builder() + Pair("lightMeasuredPayload", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("lumens", Schema.builder() + Pair("lumens", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .ref("#/components/schemas/sentAt") .build() ) )) .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") .build() ), - Pair("dimLightPayload", Schema.builder() + Pair("dimLightPayload", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("percentage", Schema.builder() + Pair("percentage", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) .description("Percentage to which the light should be dimmed to.") .build() ), - Pair("sentAt", Schema.builder() + Pair("sentAt", AsyncAPISchema.builder() .ref("#/components/schemas/sentAt") .build() ) @@ -166,7 +166,7 @@ class CorrelationId: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt index 321a6d3e..0b70e6d8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt @@ -11,9 +11,8 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding -import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme class GitterStreaming: AbstractExampleValidationTest() { @@ -48,7 +47,7 @@ class GitterStreaming: AbstractExampleValidationTest() { .parameters(mapOf( Pair("roomId", Parameter.builder() .description("Id of the Gitter room.") - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .examples(listOf("53307860c3599d1de448e19d")) .build() @@ -57,7 +56,7 @@ class GitterStreaming: AbstractExampleValidationTest() { ), Pair("resource", Parameter.builder() .description("The resource to consume.") - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .enumValue(listOf("chatMessages", "events")) .build() @@ -95,78 +94,78 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("chatMessage", Message.builder() .schemaFormat("application/schema+yaml;version=draft-07") .summary("A message represents an individual chat message sent to a room. They are a sub-resource of a room.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .description("ID of the message.") .build() ), - Pair("text", Schema.builder() + Pair("text", AsyncAPISchema.builder() .type("string") .description("Original message in plain-text/markdown.") .build() ), - Pair("html", Schema.builder() + Pair("html", AsyncAPISchema.builder() .type("string") .description("HTML formatted message.") .build() ), - Pair("sent", Schema.builder() + Pair("sent", AsyncAPISchema.builder() .type("string") .format("date-time") .description("ISO formatted date of the message.") .build() ), - Pair("fromUser", Schema.builder() + Pair("fromUser", AsyncAPISchema.builder() .type("object") .description("User that sent the message.") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .description("Gitter User ID.") .build() ), - Pair("username", Schema.builder() + Pair("username", AsyncAPISchema.builder() .type("string") .description("Gitter/GitHub username.") .build() ), - Pair("displayName", Schema.builder() + Pair("displayName", AsyncAPISchema.builder() .type("string") .description("Gitter/GitHub user real name.") .build() ), - Pair("url", Schema.builder() + Pair("url", AsyncAPISchema.builder() .type("string") .description("Path to the user on Gitter.") .build() ), - Pair("avatarUrl", Schema.builder() + Pair("avatarUrl", AsyncAPISchema.builder() .type("string") .format("uri") .description("User avatar URI.") .build() ), - Pair("avatarUrlSmall", Schema.builder() + Pair("avatarUrlSmall", AsyncAPISchema.builder() .type("string") .format("uri") .description("User avatar URI (small).") .build() ), - Pair("avatarUrlMedium", Schema.builder() + Pair("avatarUrlMedium", AsyncAPISchema.builder() .type("string") .format("uri") .description("User avatar URI (medium).") .build() ), - Pair("v", Schema.builder() + Pair("v", AsyncAPISchema.builder() .type("number") .description("Version.") .build() ), - Pair("gv", Schema.builder() + Pair("gv", AsyncAPISchema.builder() .type("string") .description("Stands for \"Gravatar version\" and is used for cache busting.") .build() @@ -174,42 +173,42 @@ class GitterStreaming: AbstractExampleValidationTest() { )) .build() ), - Pair("unread", Schema.builder() + Pair("unread", AsyncAPISchema.builder() .type("boolean") .description("Boolean that indicates if the current user has read the message.") .build() ), - Pair("readBy", Schema.builder() + Pair("readBy", AsyncAPISchema.builder() .type("number") .description("Number of users that have read the message.") .build() ), - Pair("urls", Schema.builder() + Pair("urls", AsyncAPISchema.builder() .type("array") .description("List of URLs present in the message.") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("string") .format("uri") .build()) .build() ), - Pair("mentions", Schema.builder() + Pair("mentions", AsyncAPISchema.builder() .type("array") .description("List of @Mentions in the message.") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("screenName", Schema.builder() + Pair("screenName", AsyncAPISchema.builder() .type("string") .build() ), - Pair("userId", Schema.builder() + Pair("userId", AsyncAPISchema.builder() .type("string") .build() ), - Pair("userIds", Schema.builder() + Pair("userIds", AsyncAPISchema.builder() .type("array") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("string") .build()) .build() @@ -218,29 +217,29 @@ class GitterStreaming: AbstractExampleValidationTest() { .build()) .build() ), - Pair("issues", Schema.builder() + Pair("issues", AsyncAPISchema.builder() .type("array") .description("List of #Issues referenced in the message.") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("number", Schema.builder().type("string").build()) + Pair("number", AsyncAPISchema.builder().type("string").build()) )) .build()) .build() ), - Pair("meta", Schema.builder() + Pair("meta", AsyncAPISchema.builder() .type("array") .description("Metadata. This is currently not used for anything.") - .items(Schema.builder().build()) + .items(AsyncAPISchema.builder().build()) .build() ), - Pair("v", Schema.builder() + Pair("v", AsyncAPISchema.builder() .type("number") .description("Version.") .build() ), - Pair("gv", Schema.builder() + Pair("gv", AsyncAPISchema.builder() .type("string") .description("Stands for \"Gravatar version\" and is used for cache busting.") .build() @@ -258,7 +257,7 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("heartbeat", Message.builder() .schemaFormat("application/schema+yaml;version=draft-07") .summary("Its purpose is to keep the connection alive.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("string") .enumValue(listOf("\r\n")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt index 941158eb..1934c7fe 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt @@ -9,7 +9,7 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class Mercure: AbstractExampleValidationTest() { @@ -41,7 +41,7 @@ class Mercure: AbstractExampleValidationTest() { .description("Every time a resource of type `http://schema.org/Book` is created or modified, a JSON-LD representation of the new version of this resource must be pushed in this Mercure topic.") .parameters(mapOf( Pair("id", Parameter.builder() - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("integer") .build() ) @@ -70,28 +70,28 @@ class Mercure: AbstractExampleValidationTest() { null, "https://schema.org/Book" )) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("@id", Schema.builder() + Pair("@id", AsyncAPISchema.builder() .type("string") .format("iri-reference") .build() ), - Pair("@type", Schema.builder() + Pair("@type", AsyncAPISchema.builder() .type("string") .format("iri-reference") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("isbn", Schema.builder() + Pair("isbn", AsyncAPISchema.builder() .type("string") .build() ), - Pair("abstract", Schema.builder() + Pair("abstract", AsyncAPISchema.builder() .type("string") .build() ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt index 6af8cccc..19466f8f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class Not: AbstractExampleValidationTest() { @@ -37,16 +37,16 @@ class Not: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(Schema.builder().ref("#/components/schemas/testSchema").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/testSchema").build()) .build() ) )) .schemas(mapOf( - Pair("testSchema", Schema.builder() + Pair("testSchema", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key", Schema.builder() - .not(Schema.builder().type("integer").build()) + Pair("key", AsyncAPISchema.builder() + .not(AsyncAPISchema.builder().type("integer").build()) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt index 8c6df567..f42dac69 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt @@ -7,7 +7,7 @@ import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class OneOf: AbstractExampleValidationTest() { @@ -35,10 +35,10 @@ class OneOf: AbstractExampleValidationTest() { .subscribe(Operation.builder() .message(OneOfMessages(listOf( Message.builder() - .payload(Schema.builder().ref("#/components/schemas/objectWithKey").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build()) .build(), Message.builder() - .payload(Schema.builder().ref("#/components/schemas/objectWithKey2").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build()) .build(), ))) .build() @@ -52,39 +52,39 @@ class OneOf: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .oneOf(listOf( - Schema.builder().ref("#/components/schemas/objectWithKey").build(), - Schema.builder().ref("#/components/schemas/objectWithKey2").build() + AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), + AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build() )) .build() ) .build() ), Pair("testMessage1", Message.builder() - .payload(Schema.builder().ref("#/components/schemas/objectWithKey").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build()) .build() ), Pair("testMessage2", Message.builder() - .payload(Schema.builder().ref("#/components/schemas/objectWithKey2").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build()) .build() ) )) .schemas(mapOf( - Pair("objectWithKey", Schema.builder() + Pair("objectWithKey", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key", Schema.builder() + Pair("key", AsyncAPISchema.builder() .type("string") .build() ) )) .build() ), - Pair("objectWithKey2", Schema.builder() + Pair("objectWithKey2", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("key2", Schema.builder() + Pair("key2", AsyncAPISchema.builder() .type("string") .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt index 85e1abff..ceba3db4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow @@ -54,10 +54,10 @@ class OperationSecurity: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("message", Message.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("X-SIGNATURE", Schema.builder() + Pair("X-SIGNATURE", AsyncAPISchema.builder() .type("string") .description("ECC message signature") .build() @@ -65,14 +65,14 @@ class OperationSecurity: AbstractExampleValidationTest() { )) .build() ) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("metadata", Schema.builder() + Pair("metadata", AsyncAPISchema.builder() .ref("#/components/schemas/MetaData") .build() ), - Pair("notification", Schema.builder() + Pair("notification", AsyncAPISchema.builder() .ref("#/components/schemas/Notification") .build() ) @@ -83,20 +83,20 @@ class OperationSecurity: AbstractExampleValidationTest() { ) )) .schemas(mapOf( - Pair("MetaData", Schema.builder() + Pair("MetaData", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("topic", Schema.builder() + Pair("topic", AsyncAPISchema.builder() .type("string") .description("Topic subscribed to.") .build() ), - Pair("schemaVersion", Schema.builder() + Pair("schemaVersion", AsyncAPISchema.builder() .type("string") .description("The schema for this topic.") .build() ), - Pair("deprecated", Schema.builder() + Pair("deprecated", AsyncAPISchema.builder() .type("boolean") .description("If this is a deprecated schema or topic.") .defaultValue("false") @@ -105,61 +105,61 @@ class OperationSecurity: AbstractExampleValidationTest() { )) .build() ), - Pair("Notification", Schema.builder() + Pair("Notification", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("notificationId", Schema.builder() + Pair("notificationId", AsyncAPISchema.builder() .type("string") .description("The notification Id.") .build() ), - Pair("eventDate", Schema.builder() + Pair("eventDate", AsyncAPISchema.builder() .type("string") .description("The event date associated with this notification in UTC.") .build() ), - Pair("publishDate", Schema.builder() + Pair("publishDate", AsyncAPISchema.builder() .type("string") .description("The message publish date in UTC.") .build() ), - Pair("publishAttemptCount", Schema.builder() + Pair("publishAttemptCount", AsyncAPISchema.builder() .type("integer") .description("The number of attempts made to publish this message.") .build() ), - Pair("publishAttemptCount", Schema.builder() + Pair("publishAttemptCount", AsyncAPISchema.builder() .type("integer") .description("The number of attempts made to publish this message.") .build() ), - Pair("data", Schema.builder() + Pair("data", AsyncAPISchema.builder() .ref("#/components/schemas/AuthorizationRevocationData") .build() ) )) .build() ), - Pair("AuthorizationRevocationData", Schema.builder() + Pair("AuthorizationRevocationData", AsyncAPISchema.builder() .type("object") .description("The Authorization Revocation payload.") .properties(mapOf( - Pair("username", Schema.builder() + Pair("username", AsyncAPISchema.builder() .type("string") .description("The username for the user.") .build() ), - Pair("userId", Schema.builder() + Pair("userId", AsyncAPISchema.builder() .type("string") .description("The immutable public userId for the user") .build() ), - Pair("eiasToken", Schema.builder() + Pair("eiasToken", AsyncAPISchema.builder() .type("string") .description("The legacy eiasToken specific to the user") .build() ), - Pair("revokeReason", Schema.builder() + Pair("revokeReason", AsyncAPISchema.builder() .type("string") .enumValue(listOf( "REVOKED_BY_APP", @@ -170,7 +170,7 @@ class OperationSecurity: AbstractExampleValidationTest() { .description("The reason for authorization revocation") .build() ), - Pair("revocationDate", Schema.builder() + Pair("revocationDate", AsyncAPISchema.builder() .type("string") .description("Date and time when the authorization was revoked") .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt index 17f6f40a..d295b8f0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class RpcClient: AbstractExampleValidationTest() { @@ -46,7 +46,7 @@ class RpcClient: AbstractExampleValidationTest() { Pair("{queue}", ChannelItem.builder() .parameters(mapOf( Pair("queue", Parameter.builder() - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .pattern("^amq\\\\.gen\\\\-.+\$") .build()) @@ -73,10 +73,10 @@ class RpcClient: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("result", Schema.builder() + Pair("result", AsyncAPISchema.builder() .type("number") .examples(listOf(7)) .build()) @@ -110,12 +110,12 @@ class RpcClient: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("numbers", Schema.builder() + Pair("numbers", AsyncAPISchema.builder() .type("array") - .items(Schema.builder().type("number").build()) + .items(AsyncAPISchema.builder().type("number").build()) .examples(listOf(listOf(4, 3))) .build()) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt index a62ee78e..30308bef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class RpcServer: AbstractExampleValidationTest() { @@ -46,7 +46,7 @@ class RpcServer: AbstractExampleValidationTest() { Pair("{queue}", ChannelItem.builder() .parameters(mapOf( Pair("queue", Parameter.builder() - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .pattern("^amq\\\\.gen\\\\-.+\$") .build()) @@ -73,10 +73,10 @@ class RpcServer: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("result", Schema.builder() + Pair("result", AsyncAPISchema.builder() .type("number") .examples(listOf(7)) .build()) @@ -104,12 +104,12 @@ class RpcServer: AbstractExampleValidationTest() { .operationId("sum") .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("numbers", Schema.builder() + Pair("numbers", AsyncAPISchema.builder() .type("array") - .items(Schema.builder().type("number").build()) + .items(AsyncAPISchema.builder().type("number").build()) .examples(listOf(listOf(4, 3))) .build()) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt index da69e351..0ae322d6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class Simple: AbstractExampleValidationTest() { @@ -38,15 +38,15 @@ class Simple: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("UserSignedUp", Message.builder() - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("displayName", Schema.builder() + Pair("displayName", AsyncAPISchema.builder() .type("string") .description("Name of the user") .build() ), - Pair("email", Schema.builder() + Pair("email", AsyncAPISchema.builder() .type("string") .format("email") .description("Email of the user") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt index c1ee8b78..b821eedb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.http.HttpApiKeySecurityScheme class SlackRtm: AbstractExampleValidationTest() { @@ -114,62 +114,62 @@ class SlackRtm: AbstractExampleValidationTest() { )) .schemas(mapOf( Pair("attachment", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("fallback", Schema.builder() + Pair("fallback", AsyncAPISchema.builder() .type("string") .build() ), - Pair("color", Schema.builder() + Pair("color", AsyncAPISchema.builder() .type("string") .build() ), - Pair("pretext", Schema.builder() + Pair("pretext", AsyncAPISchema.builder() .type("string") .build() ), - Pair("author_name", Schema.builder() + Pair("author_name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("author_link", Schema.builder() + Pair("author_link", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("author_icon", Schema.builder() + Pair("author_icon", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("title", Schema.builder() + Pair("title", AsyncAPISchema.builder() .type("string") .build() ), - Pair("title_link", Schema.builder() + Pair("title_link", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("text", Schema.builder() + Pair("text", AsyncAPISchema.builder() .type("string") .build() ), - Pair("fields", Schema.builder() + Pair("fields", AsyncAPISchema.builder() .type("array") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("title", Schema.builder() + Pair("title", AsyncAPISchema.builder() .type("string") .build() ), - Pair("value", Schema.builder() + Pair("value", AsyncAPISchema.builder() .type("string") .build() ), - Pair("short", Schema.builder() + Pair("short", AsyncAPISchema.builder() .type("boolean") .build() ), @@ -178,26 +178,26 @@ class SlackRtm: AbstractExampleValidationTest() { ) .build() ), - Pair("image_url", Schema.builder() + Pair("image_url", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("thumb_url", Schema.builder() + Pair("thumb_url", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("footer", Schema.builder() + Pair("footer", AsyncAPISchema.builder() .type("string") .build() ), - Pair("footer_icon", Schema.builder() + Pair("footer_icon", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("number") .build() ), @@ -209,10 +209,10 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("hello", Message.builder() .summary("First event received upon connection.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("hello")) .build() @@ -225,19 +225,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("connectionError", Message.builder() .summary("Event received when a connection error happens.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("error")) .build() ), - Pair("error", Schema.builder() + Pair("error", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("code", Schema.builder().type("number").build()), - Pair("msg", Schema.builder().type("string").build()), + Pair("code", AsyncAPISchema.builder().type("number").build()), + Pair("msg", AsyncAPISchema.builder().type("string").build()), )) .build() ) @@ -249,10 +249,10 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("accountsChanged", Message.builder() .summary("The list of accounts a user is signed into has changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("accounts_changed")) .build() @@ -265,32 +265,32 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("botAdded", Message.builder() .summary("A bot user was added.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("bot_added")) .build() ), - Pair("bot", Schema.builder() + Pair("bot", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("app_id", Schema.builder() + Pair("app_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("icons", Schema.builder() + Pair("icons", AsyncAPISchema.builder() .type("object") - .additionalProperties(Schema.builder().type("string").build()) + .additionalProperties(AsyncAPISchema.builder().type("string").build()) .build() ) )) @@ -304,32 +304,32 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("botChanged", Message.builder() .summary("A bot user was changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("bot_added")) .build() ), - Pair("bot", Schema.builder() + Pair("bot", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("app_id", Schema.builder() + Pair("app_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("icons", Schema.builder() + Pair("icons", AsyncAPISchema.builder() .type("object") - .additionalProperties(Schema.builder().type("string").build()) + .additionalProperties(AsyncAPISchema.builder().type("string").build()) .build() ) )) @@ -343,19 +343,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelArchive", Message.builder() .summary("A channel was archived.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_archive")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -367,30 +367,30 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelCreated", Message.builder() .summary("A channel was created.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_created")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), - Pair("creator", Schema.builder() + Pair("creator", AsyncAPISchema.builder() .type("string") .build() ) @@ -405,15 +405,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelDeleted", Message.builder() .summary("A channel was deleted.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_deleted")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ) @@ -425,23 +425,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelHistoryChanged", Message.builder() .summary("Bulk updates were made to a channel's history.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_history_changed")) .build() ), - Pair("latest", Schema.builder() + Pair("latest", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ) @@ -453,30 +453,30 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelJoined", Message.builder() .summary("You joined a channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_joined")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), - Pair("creator", Schema.builder() + Pair("creator", AsyncAPISchema.builder() .type("string") .build() ) @@ -491,15 +491,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelLeft", Message.builder() .summary("You left a channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_left")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ) @@ -511,19 +511,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelMarked", Message.builder() .summary("Your channel read marker was updated.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_marked")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ) @@ -535,26 +535,26 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelRename", Message.builder() .summary("A channel was renamed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_rename")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ) @@ -569,19 +569,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelUnarchive", Message.builder() .summary("A channel was unarchived.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("channel_unarchive")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -593,15 +593,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("commandsChanged", Message.builder() .summary("A slash command has been added or changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("commands_changed")) .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ) @@ -613,38 +613,38 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("dndUpdated", Message.builder() .summary("Do not Disturb settings changed for the current user.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("dnd_updated")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("dnd_status", Schema.builder() + Pair("dnd_status", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("dnd_enabled", Schema.builder() + Pair("dnd_enabled", AsyncAPISchema.builder() .type("boolean") .build() ), - Pair("next_dnd_start_ts", Schema.builder() + Pair("next_dnd_start_ts", AsyncAPISchema.builder() .type("number") .build() ), - Pair("next_dnd_end_ts", Schema.builder() + Pair("next_dnd_end_ts", AsyncAPISchema.builder() .type("number") .build() ), - Pair("snooze_enabled", Schema.builder() + Pair("snooze_enabled", AsyncAPISchema.builder() .type("boolean") .build() ), - Pair("snooze_endtime", Schema.builder() + Pair("snooze_endtime", AsyncAPISchema.builder() .type("number") .build() ) @@ -659,30 +659,30 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("dndUpdatedUser", Message.builder() .summary("Do not Disturb settings changed for a member.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("dnd_updated_user")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("dnd_status", Schema.builder() + Pair("dnd_status", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("dnd_enabled", Schema.builder() + Pair("dnd_enabled", AsyncAPISchema.builder() .type("boolean") .build() ), - Pair("next_dnd_start_ts", Schema.builder() + Pair("next_dnd_start_ts", AsyncAPISchema.builder() .type("number") .build() ), - Pair("next_dnd_end_ts", Schema.builder() + Pair("next_dnd_end_ts", AsyncAPISchema.builder() .type("number") .build() ) @@ -697,19 +697,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emailDomainChanged", Message.builder() .summary("The workspace email domain has changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("email_domain_changed")) .build() ), - Pair("email_domain", Schema.builder() + Pair("email_domain", AsyncAPISchema.builder() .type("string") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -721,25 +721,25 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emojiRemoved", Message.builder() .summary("A custom emoji has been removed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("emoji_changed")) .build() ), - Pair("subtype", Schema.builder() + Pair("subtype", AsyncAPISchema.builder() .type("string") .enumValue(listOf("remove")) .build() ), - Pair("names", Schema.builder() + Pair("names", AsyncAPISchema.builder() .type("array") - .items(Schema.builder().type("string").build()) + .items(AsyncAPISchema.builder().type("string").build()) .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -751,29 +751,29 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emojiAdded", Message.builder() .summary("A custom emoji has been added.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("emoji_changed")) .build() ), - Pair("subtype", Schema.builder() + Pair("subtype", AsyncAPISchema.builder() .type("string") .enumValue(listOf("add")) .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("value", Schema.builder() + Pair("value", AsyncAPISchema.builder() .type("string") .format("uri") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -785,22 +785,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileChange", Message.builder() .summary("A file was changed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_change")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -812,23 +812,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentAdded", Message.builder() .summary("A file comment was added.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_comment_added")) .build() ), - Pair("comment", Schema()), - Pair("file_id", Schema.builder() + Pair("comment", AsyncAPISchema()), + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -840,26 +840,26 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentDeleted", Message.builder() .summary("A file comment was deleted.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_comment_deleted")) .build() ), - Pair("comment", Schema.builder() + Pair("comment", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -871,23 +871,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentEdited", Message.builder() .summary("A file comment was edited.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_comment_edited")) .build() ), - Pair("comment", Schema()), - Pair("file_id", Schema.builder() + Pair("comment", AsyncAPISchema()), + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -899,22 +899,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCreated", Message.builder() .summary("A file was created.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_created")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -926,19 +926,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileDeleted", Message.builder() .summary("A file was deleted.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_deleted")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -950,22 +950,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("filePublic", Message.builder() .summary("A file was made public.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_public")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -977,22 +977,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileShared", Message.builder() .summary("A file was shared.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_shared")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -1004,22 +1004,22 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileUnshared", Message.builder() .summary("A file was unshared.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("file_unshared")) .build() ), - Pair("file_id", Schema.builder() + Pair("file_id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("file", Schema.builder() + Pair("file", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder().type("string").build()), + Pair("id", AsyncAPISchema.builder().type("string").build()), )) .build() ), @@ -1031,10 +1031,10 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("goodbye", Message.builder() .summary("The server intends to close the connection soon.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("goodbye")) .build() @@ -1047,15 +1047,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupArchive", Message.builder() .summary("A private channel was archived.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_archive")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), @@ -1067,19 +1067,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupClose", Message.builder() .summary("You closed a private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_close")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), @@ -1091,23 +1091,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupHistoryChanged", Message.builder() .summary("Bulk updates were made to a private channel's history.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_history_changed")) .build() ), - Pair("latest", Schema.builder() + Pair("latest", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), - Pair("event_ts", Schema.builder() + Pair("event_ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -1119,30 +1119,30 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupJoined", Message.builder() .summary("You joined a private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_joined")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), - Pair("creator", Schema.builder() + Pair("creator", AsyncAPISchema.builder() .type("string") .build() ), @@ -1157,15 +1157,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupLeft", Message.builder() .summary("You left a private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_left")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), @@ -1177,19 +1177,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupMarked", Message.builder() .summary("A private channel read marker was updated.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_marked")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -1201,19 +1201,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupOpen", Message.builder() .summary("You opened a private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_open")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1225,26 +1225,26 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupRename", Message.builder() .summary("A private channel was renamed.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_rename")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), @@ -1259,19 +1259,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupUnarchive", Message.builder() .summary("A private channel was unarchived.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("group_unarchive")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1283,19 +1283,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imClose", Message.builder() .summary("You closed a DM.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("im_close")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1307,37 +1307,37 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imCreated", Message.builder() .summary("A DM was created.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("im_created")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("string") .build() ), - Pair("name", Schema.builder() + Pair("name", AsyncAPISchema.builder() .type("string") .build() ), - Pair("created", Schema.builder() + Pair("created", AsyncAPISchema.builder() .type("number") .build() ), - Pair("creator", Schema.builder() + Pair("creator", AsyncAPISchema.builder() .type("string") .build() ), )) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1349,19 +1349,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imMarked", Message.builder() .summary("A direct message read marker was updated.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("im_marked")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), @@ -1373,19 +1373,19 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imOpen", Message.builder() .summary("You opened a DM.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("im_open")) .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), @@ -1397,15 +1397,15 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("manualPresenceChange", Message.builder() .summary("You manually updated your presence.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("manual_presence_change")) .build() ), - Pair("presence", Schema.builder() + Pair("presence", AsyncAPISchema.builder() .type("string") .build() ), @@ -1417,32 +1417,32 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("memberJoinedChannel", Message.builder() .summary("A user joined a public or private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("member_joined_channel")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel_type", Schema.builder() + Pair("channel_type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("C", "G")) .build() ), - Pair("team", Schema.builder() + Pair("team", AsyncAPISchema.builder() .type("string") .build() ), - Pair("inviter", Schema.builder() + Pair("inviter", AsyncAPISchema.builder() .type("string") .build() ), @@ -1454,28 +1454,28 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("memberLeftChannel", Message.builder() .summary("A user left a public or private channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("member_left_channel")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel_type", Schema.builder() + Pair("channel_type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("C", "G")) .build() ), - Pair("team", Schema.builder() + Pair("team", AsyncAPISchema.builder() .type("string") .build() ), @@ -1487,43 +1487,43 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("message", Message.builder() .summary("A message was sent to a channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("message")) .build() ), - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("text", Schema.builder() + Pair("text", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ), - Pair("attachments", Schema.builder() + Pair("attachments", AsyncAPISchema.builder() .type("array") - .items(Schema.builder().ref("#/components/schemas/attachment").build()) + .items(AsyncAPISchema.builder().ref("#/components/schemas/attachment").build()) .build() ), - Pair("edited", Schema.builder() + Pair("edited", AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("user", Schema.builder() + Pair("user", AsyncAPISchema.builder() .type("string") .build() ), - Pair("ts", Schema.builder() + Pair("ts", AsyncAPISchema.builder() .type("string") .build() ) @@ -1538,23 +1538,23 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("outgoingMessage", Message.builder() .summary("A message was sent to a channel.") - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("message")) .build() ), - Pair("id", Schema.builder() + Pair("id", AsyncAPISchema.builder() .type("number") .build() ), - Pair("channel", Schema.builder() + Pair("channel", AsyncAPISchema.builder() .type("string") .build() ), - Pair("text", Schema.builder() + Pair("text", AsyncAPISchema.builder() .type("string") .build() ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt index 0503d046..f78e54ab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt @@ -13,9 +13,8 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.security_scheme.SecurityScheme import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.v2.security_scheme.SecurityScheme import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -155,7 +154,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .contentType("application/json") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ), Pair("turnOnOff", @@ -164,7 +163,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .title("Turn on/off") .summary("Command a particular streetlight to turn the lights on or off.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/turnOnOffPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/turnOnOffPayload").build()) .build() ), Pair("dimLight", @@ -173,51 +172,51 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) .build() ) )) .schemas(mapOf( Pair("lightMeasuredPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("lumens", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("turnOnOffPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("command", - Schema.builder() + AsyncAPISchema.builder() .type("string") .enumValue(listOf("on", "off")) .description("Whether to turn on or off the light.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("dimLightPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("percentage", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) @@ -225,13 +224,13 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("sentAt", - Schema.builder() + AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") @@ -255,17 +254,17 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("my-app-header", Schema.builder() + Pair("my-app-header", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt index 417d2c96..e1204b33 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt @@ -14,7 +14,7 @@ import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme @@ -146,7 +146,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .contentType("application/json") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ), Pair("turnOnOff", @@ -155,7 +155,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .title("Turn on/off") .summary("Command a particular streetlight to turn the lights on or off.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/turnOnOffPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/turnOnOffPayload").build()) .build() ), Pair("dimLight", @@ -164,51 +164,51 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) .build() ) )) .schemas(mapOf( Pair("lightMeasuredPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("lumens", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("turnOnOffPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("command", - Schema.builder() + AsyncAPISchema.builder() .type("string") .enumValue(listOf("on", "off")) .description("Whether to turn on or off the light.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("dimLightPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("percentage", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) @@ -216,13 +216,13 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("sentAt", - Schema.builder() + AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") @@ -282,17 +282,17 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("my-app-header", Schema.builder() + Pair("my-app-header", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt index 26d996e0..79a56696 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt @@ -12,12 +12,11 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v2.security_scheme.SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.AsyncAPISchema import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -141,7 +140,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .contentType("application/json") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) .build() ), Pair("turnOnOff", @@ -150,7 +149,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .title("Turn on/off") .summary("Command a particular streetlight to turn the lights on or off.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/turnOnOffPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/turnOnOffPayload").build()) .build() ), Pair("dimLight", @@ -159,51 +158,51 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(Schema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) .build() ) )) .schemas(mapOf( Pair("lightMeasuredPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("lumens", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .description("Light intensity measured in lumens.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("turnOnOffPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("command", - Schema.builder() + AsyncAPISchema.builder() .type("string") .enumValue(listOf("on", "off")) .description("Whether to turn on or off the light.") .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("dimLightPayload", - Schema.builder() + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("percentage", - Schema.builder() + AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) @@ -211,13 +210,13 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .build() ), Pair("sentAt", - Schema.builder().ref("#/components/schemas/sentAt").build() + AsyncAPISchema.builder().ref("#/components/schemas/sentAt").build() ) )) .build() ), Pair("sentAt", - Schema.builder() + AsyncAPISchema.builder() .type("string") .format("date-time") .description("Date and time when the message was sent.") @@ -253,17 +252,17 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .parameters(mapOf( Pair("streetlightId", Parameter.builder() .description("The ID of the streetlight.") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() ) )) .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( - Pair("my-app-header", Schema.builder() + Pair("my-app-header", AsyncAPISchema.builder() .type("integer") .minimum(BigDecimal.ZERO) .maximum(BigDecimal.valueOf(100)) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt index 087970af..d7daea45 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt @@ -11,7 +11,6 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.Contact import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding -import com.asyncapi.v2.schema.Schema import com.asyncapi.schemas.AsyncAPISchema class WebsocketGemini: AbstractExampleValidationTest() { @@ -53,7 +52,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { mapOf( Pair("symbol", Parameter.builder() - .schema(Schema.builder() + .schema(AsyncAPISchema.builder() .type("string") .enumValue(listOf( "btcusd", @@ -223,7 +222,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { .description( "The initial response message will show the existing state of the order book. Subsequent messages will show all executed trades, as well as all other changes to the order book from orders placed or canceled.\n" ) - .payload(Schema.builder().ref("#/components/schemas/market").build()) + .payload(AsyncAPISchema.builder().ref("#/components/schemas/market").build()) .examples(listOf( MessageExample.builder() .name("updateMessage") @@ -257,34 +256,34 @@ class WebsocketGemini: AbstractExampleValidationTest() { ) )) .schemas(mapOf( - Pair("market", Schema.builder() + Pair("market", AsyncAPISchema.builder() .type("object") .oneOf(listOf( - Schema.builder().ref("#/components/schemas/heartbeat").build(), - Schema.builder().ref("#/components/schemas/update").build(), + AsyncAPISchema.builder().ref("#/components/schemas/heartbeat").build(), + AsyncAPISchema.builder().ref("#/components/schemas/update").build(), )) .build() ), - Pair("heartbeat", Schema.builder() + Pair("heartbeat", AsyncAPISchema.builder() .allOf(listOf( - Schema.builder() + AsyncAPISchema.builder() .properties(mapOf( - Pair("type", Schema.builder().type("string").constValue("heartbeat").build()) + Pair("type", AsyncAPISchema.builder().type("string").constValue("heartbeat").build()) )) .required(listOf("type")) .build(), - Schema.builder() + AsyncAPISchema.builder() .ref("#/components/schemas/default") .build(), )) .build() ), - Pair("update", Schema.builder() + Pair("update", AsyncAPISchema.builder() .allOf(listOf( - Schema.builder() + AsyncAPISchema.builder() .properties(mapOf( - Pair("type", Schema.builder().type("string").constValue("update").build()), - Pair("eventId", Schema.builder() + Pair("type", AsyncAPISchema.builder().type("string").constValue("update").build()), + Pair("eventId", AsyncAPISchema.builder() .type("integer") .description( "A monotonically increasing sequence number indicating when this " + @@ -293,8 +292,8 @@ class WebsocketGemini: AbstractExampleValidationTest() { ) .build() ), - Pair("events", Schema.builder().ref("#/components/schemas/events").build()), - Pair("timestamp", Schema.builder() + Pair("events", AsyncAPISchema.builder().ref("#/components/schemas/events").build()), + Pair("timestamp", AsyncAPISchema.builder() .type("number") .description( "The timestamp in seconds for this group of events (included for " + @@ -303,7 +302,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { ) .build() ), - Pair("timestampms", Schema.builder() + Pair("timestampms", AsyncAPISchema.builder() .type("number") .description("The timestamp in milliseconds for this group of events.") .build() @@ -311,18 +310,18 @@ class WebsocketGemini: AbstractExampleValidationTest() { )) .required(listOf("type", "eventId", "events", "timestamp", "timestampms")) .build(), - Schema.builder().ref("#/components/schemas/default").build(), + AsyncAPISchema.builder().ref("#/components/schemas/default").build(), )) .build() ), - Pair("default", Schema.builder() + Pair("default", AsyncAPISchema.builder() .type("object") .description( "This object is always part of the payload. In case of type=heartbeat, " + "these are the only fields.") .required(listOf("type", "socket_sequence")) .properties(mapOf( - Pair("socket_sequence", Schema.builder() + Pair("socket_sequence", AsyncAPISchema.builder() .type("integer") .description( "zero-indexed monotonic increasing sequence number attached to each " + @@ -337,30 +336,30 @@ class WebsocketGemini: AbstractExampleValidationTest() { )) .build() ), - Pair("events", Schema.builder() + Pair("events", AsyncAPISchema.builder() .type("array") .description("Either a change to the order book, or the indication that a trade has occurred.") - .items(Schema.builder() + .items(AsyncAPISchema.builder() .type("object") .additionalProperties(false) .properties(mapOf( - Pair("type", Schema.builder() + Pair("type", AsyncAPISchema.builder() .type("string") .enumValue(listOf("trade", "change", "auction, block_trade")) .build() ), - Pair("price", Schema.builder() + Pair("price", AsyncAPISchema.builder() .type("number") .multipleOf(0.01) .description("The price of this order book entry.") .build() ), - Pair("side", Schema.builder() + Pair("side", AsyncAPISchema.builder() .type("string") .enumValue(listOf("bid", "side")) .build() ), - Pair("reason", Schema.builder() + Pair("reason", AsyncAPISchema.builder() .type("string") .enumValue(listOf("place", "trade", "cancel", "initial")) .description( @@ -370,14 +369,14 @@ class WebsocketGemini: AbstractExampleValidationTest() { ) .build() ), - Pair("remaining", Schema.builder() + Pair("remaining", AsyncAPISchema.builder() .type("number") .description( "The quantity remaining at that price level after this change occurred. May be zero if all orders at this price level have been filled or canceled." ) .build() ), - Pair("delta", Schema.builder() + Pair("delta", AsyncAPISchema.builder() .type("number") .description( "The quantity changed. May be negative, if an order is filled or canceled. For initial messages, delta will equal remaining." diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 35251c99..074777d3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v2._0_0.model.channel import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._0_0.model.channel.operation.OperationWithReferenceToMessageTest -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.bindings.ChannelBinding import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding @@ -39,7 +39,7 @@ class ChannelItemTest: SerDeTest() { val subscribe = OperationWithReferenceToMessageTest().build() val publish = OperationWithMessageTest().build() val userIdParameter = ParameterTest().build() - userIdParameter.schema = Schema.builder().type("string").build() + userIdParameter.schema = AsyncAPISchema.builder().type("string").build() return ChannelItem.builder() .description("This channel is used to exchange messages about users signing up") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ParameterTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ParameterTest.kt index d0fb8dfa..4880c61e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ParameterTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ParameterTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model.channel import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema /** * @author Pavel Bodiachevskii @@ -20,7 +20,7 @@ class ParameterTest: SerDeTest() { return Parameter.builder() .description("Id of the user.") .location("\$message.payload#/user/id") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index e9a4742a..50e2cb94 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.schemas.Reference import com.asyncapi.v2._0_0.model.Tag -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.bindings.MessageBinding import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding @@ -41,19 +41,19 @@ class MessageTest: SerDeTest() { override fun build(): Message { return Message.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( "correlationId", - Schema.builder() + AsyncAPISchema.builder() .description("Correlation ID set by application") .type("string") .build() ), Pair( "applicationInstanceId", - Schema.builder() + AsyncAPISchema.builder() .description("Unique identifier for a given instance of the publishing application") .type("string") .build() @@ -61,18 +61,18 @@ class MessageTest: SerDeTest() { )) .build() ) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( "user", - Schema.builder() + AsyncAPISchema.builder() .ref("#/components/schemas/userCreate") .build() ), Pair( "signup", - Schema.builder() + AsyncAPISchema.builder() .ref("#/components/schemas/signup") .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 860ccd83..1ffae1ae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v2._0_0.model.channel.message import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.Tag -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test @@ -39,19 +39,19 @@ class MessageTraitTest: SerDeTest() { override fun build(): MessageTrait { return MessageTrait.builder() - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( "correlationId", - Schema.builder() + AsyncAPISchema.builder() .description("Correlation ID set by application") .type("string") .build() ), Pair( "applicationInstanceId", - Schema.builder() + AsyncAPISchema.builder() .description("Unique identifier for a given instance of the publishing application") .type("string") .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt index 734c4633..4f0ae757 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt @@ -9,8 +9,8 @@ import com.asyncapi.v2._0_0.model.channel.message.MessageTest import com.asyncapi.v2._0_0.model.channel.message.MessageTraitTest import com.asyncapi.v2._0_0.model.channel.operation.OperationTest import com.asyncapi.v2._0_0.model.channel.operation.OperationTraitTest -import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.schema.Type +import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.Type import com.asyncapi.v2._0_0.model.server.ServerTest import com.asyncapi.v2.security_scheme.ApiKeySecuritySchemeTest import com.asyncapi.v2.security_scheme.OpenIdConnectSecuritySchemeTest @@ -35,19 +35,19 @@ class ComponentsTest: SerDeTest() { override fun build(): Components { return Components.builder() .schemas(mapOf( - Pair("Category", Schema.builder() + Pair("Category", AsyncAPISchema.builder() .type(Type.OBJECT) .properties(mapOf( - Pair("id", Schema.builder().type(Type.INTEGER).format("int64").build()), - Pair("name", Schema.builder().type(Type.STRING).build()) + Pair("id", AsyncAPISchema.builder().type(Type.INTEGER).format("int64").build()), + Pair("name", AsyncAPISchema.builder().type(Type.STRING).build()) )) .build() ), - Pair("Tag", Schema.builder() + Pair("Tag", AsyncAPISchema.builder() .type(Type.OBJECT) .properties(mapOf( - Pair("id", Schema.builder().type(Type.INTEGER).format("int64").build()), - Pair("name", Schema.builder().type(Type.STRING).build()) + Pair("id", AsyncAPISchema.builder().type(Type.INTEGER).format("int64").build()), + Pair("name", AsyncAPISchema.builder().type(Type.STRING).build()) )) .build() ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index ad63b6e8..28735883 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTest -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test @@ -27,7 +27,7 @@ class ChannelItemTest: SerDeTest() { val subscribe = OperationWithOneOfMessageTest().build() val publish = OperationWithMessageTest().build() val userIdParameter = ParameterWithSchemaTest().build() - userIdParameter.schema = Schema.builder().type("string").build() + userIdParameter.schema = AsyncAPISchema.builder().type("string").build() return ChannelItem.builder() .description("This channel is used to exchange messages about users signing up") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt index dd0cb00a..5c0dc90b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v2._6_0.model.channel import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema class ParameterWithReferenceToSchemaTest: SerDeTest() { @@ -38,7 +38,7 @@ class ParameterWithSchemaTest: SerDeTest() { return Parameter.builder() .description("Id of the user.") .location("\$message.payload#/user/id") - .schema(Schema.builder().type("string").build()) + .schema(AsyncAPISchema.builder().type("string").build()) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index ac1b91ed..b0c9198a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test @@ -26,19 +26,19 @@ class MessageTest: SerDeTest() { override fun build(): Message { return Message.builder() .messageId("userSignup") - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( "correlationId", - Schema.builder() + AsyncAPISchema.builder() .description("Correlation ID set by application") .type("string") .build() ), Pair( "applicationInstanceId", - Schema.builder() + AsyncAPISchema.builder() .description("Unique identifier for a given instance of the publishing application") .type("string") .build() @@ -46,18 +46,18 @@ class MessageTest: SerDeTest() { )) .build() ) - .payload(Schema.builder() + .payload(AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( "user", - Schema.builder() + AsyncAPISchema.builder() .ref("#/components/schemas/userCreate") .build() ), Pair( "signup", - Schema.builder() + AsyncAPISchema.builder() .ref("#/components/schemas/signup") .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 035dd846..e734361a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -4,7 +4,7 @@ import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test @@ -26,19 +26,19 @@ class MessageTraitTest: SerDeTest() { override fun build(): MessageTrait { return MessageTrait.builder() .messageId("userSignup") - .headers(Schema.builder() + .headers(AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( "correlationId", - Schema.builder() + AsyncAPISchema.builder() .description("Correlation ID set by application") .type("string") .build() ), Pair( "applicationInstanceId", - Schema.builder() + AsyncAPISchema.builder() .description("Unique identifier for a given instance of the publishing application") .type("string") .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageWithArrayPayloadTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageWithArrayPayloadTest.kt index 200e7eff..03653bd0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageWithArrayPayloadTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageWithArrayPayloadTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.message import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.v2.schema.Schema +import com.asyncapi.schemas.AsyncAPISchema import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test @@ -14,9 +14,9 @@ class MessageWithArrayPayloadTest { @DisplayName("Test array items property is parsed as a schema object") fun testArrayItemsPropertyIsParsedAsSchemaObjectWhenItIsASingleJsonSchema() { val model = ClasspathUtils.readAsString("/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadJsonSchema.json") - val schema = objectMapper.readValue(model, Message::class.java).payload as Schema + val schema = objectMapper.readValue(model, Message::class.java).payload as AsyncAPISchema assertTrue( - schema.items is Schema + schema.items is AsyncAPISchema ) } @@ -24,7 +24,7 @@ class MessageWithArrayPayloadTest { @DisplayName("Test array items property is parsed as list of schemas") fun testArrayItemsPropertyIsParsedAsArrayListOfSchemasWhenItIsAnArrayOfSchemas() { val model = ClasspathUtils.readAsString("/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadArrayOfSchemas.json") - val schema = objectMapper.readValue(model, Message::class.java).payload as Schema - assertTrue(schema.items is ArrayList<*> && (schema.items as ArrayList<*>).all { it is Schema }) + val schema = objectMapper.readValue(model, Message::class.java).payload as AsyncAPISchema + assertTrue(schema.items is ArrayList<*> && (schema.items as ArrayList<*>).all { it is AsyncAPISchema }) } } \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt index 2798c496..e71d1916 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt @@ -2,8 +2,8 @@ package com.asyncapi.v2._6_0.model.component import com.asyncapi.schemas.Reference import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.schema.Schema -import com.asyncapi.v2.schema.Type +import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.Type import com.asyncapi.v2._6_0.model.channel.ChannelItemTest import com.asyncapi.v2._6_0.model.channel.ParameterWithSchemaTest import com.asyncapi.v2._6_0.model.channel.ParameterWithReferenceToSchemaTest @@ -38,19 +38,19 @@ class ComponentsTest: SerDeTest() { override fun build(): Components { return Components.builder() .schemas(mapOf( - Pair("Category", Schema.builder() + Pair("Category", AsyncAPISchema.builder() .type(Type.OBJECT) .properties(mapOf( - Pair("id", Schema.builder().type(Type.INTEGER).format("int64").build()), - Pair("name", Schema.builder().type(Type.STRING).build()) + Pair("id", AsyncAPISchema.builder().type(Type.INTEGER).format("int64").build()), + Pair("name", AsyncAPISchema.builder().type(Type.STRING).build()) )) .build() ), - Pair("Tag", Schema.builder() + Pair("Tag", AsyncAPISchema.builder() .type(Type.OBJECT) .properties(mapOf( - Pair("id", Schema.builder().type(Type.INTEGER).format("int64").build()), - Pair("name", Schema.builder().type(Type.STRING).build()) + Pair("id", AsyncAPISchema.builder().type(Type.INTEGER).format("int64").build()), + Pair("name", AsyncAPISchema.builder().type(Type.STRING).build()) )) .build() ), diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 75debf33..5fc2bda2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -652,12 +652,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -991,12 +991,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -1398,12 +1398,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index cdd33528..5372e9d2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -535,12 +535,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 545a2261..ccbfc53f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -3,12 +3,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index ea46fcd2..344aeca2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -3,12 +3,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 9fc9bb70..a682656d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -266,12 +266,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 27ac037e..2990e7e1 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -34,12 +34,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -441,12 +441,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 10a6391e..670bae98 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -409,12 +409,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -842,12 +842,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -1580,12 +1580,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -2013,12 +2013,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -2325,12 +2325,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -2751,12 +2751,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json index c04dfb99..a4e8785a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json @@ -279,12 +279,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -712,12 +712,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json index 22cead65..b4597976 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json @@ -4,12 +4,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json index f40f2f37..8109f8ac 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json @@ -4,12 +4,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json index 5c6feaa3..ca2941ba 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json @@ -273,12 +273,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json index 3eaa6f85..aee00358 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json @@ -276,12 +276,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 08854c99..e4880d2e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -431,12 +431,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -864,12 +864,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -1176,12 +1176,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, @@ -1602,12 +1602,12 @@ "type" : "object", "properties" : { "correlationId" : { - "description" : "Correlation ID set by application", - "type" : "string" + "type" : "string", + "description" : "Correlation ID set by application" }, "applicationInstanceId" : { - "description" : "Unique identifier for a given instance of the publishing application", - "type" : "string" + "type" : "string", + "description" : "Unique identifier for a given instance of the publishing application" } } }, From 2e42fad8d6fdc9c516ca94f34a8b0a21ee7ca72c Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 11:38:06 +0400 Subject: [PATCH 077/141] feat(schemas): v2.6.0 use MultiFormatSchema - Message, MessageTrait and for Schema in Components --- .../message/MessageHeadersDeserializer.java | 68 +++++++++++++-- .../message/MessagePayloadDeserializer.java | 67 ++++++++++++++- .../ComponentsSchemasDeserializer.java | 86 +++++++++++++++++-- .../_6_0/model/channel/message/Message.java | 11 ++- .../model/channel/message/MessageTrait.java | 5 +- .../v2/_6_0/model/component/Components.java | 5 +- 6 files changed, 221 insertions(+), 21 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 2c8fdafe..c33605d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,23 +1,77 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; /** * Serializes message traits list. * * @author Pavel Bodiachevskii */ -public class MessageHeadersDeserializer extends ReferenceOrObjectDeserializer { +public class MessageHeadersDeserializer extends JsonDeserializer { @Override - public Class objectTypeClass() { - return AsyncAPISchema.class; + public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { + ObjectCodec objectCodec = p.getCodec(); + JsonNode node = objectCodec.readTree(p); + + /* + Problem: + Both, Reference class and Schema class have $ref field. + So, this is only reason why I receive next exception: + "com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: + Unrecognized field "title" (class com.asyncapi.v2._6_0.model.Reference), + not marked as ignorable (one known property: "$ref"])" + in case when Schema contains $ref. + Solution: + Try to deserialize reference. In case of exception, try to deserialize it as given ObjectType. In case of + one more exception, throw it. + TODO: Think how to improve. + */ + try { + return chooseKnownPojo(node, objectCodec); + } catch (UnrecognizedPropertyException unrecognizedPropertyException) { + return readAsObject(node, objectCodec); + } + } + + private Object chooseKnownPojo(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { + JsonNode ref = jsonNode.get("$ref"); + try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { + if (isMultiFormatSchema(jsonNode)) { + return jsonParser.readValueAs(MultiFormatSchema.class); + } + + if (ref != null) { + return jsonParser.readValueAs(Reference.class); + } else { + return jsonParser.readValueAs(AsyncAPISchema.class); + } + } } - public Class referenceClass() { - return Reference.class; + private Object readAsObject(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { + try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { + return jsonParser.readValueAs(AsyncAPISchema.class); + } + } + + private boolean isMultiFormatSchema(@NotNull JsonNode jsonNode) { + JsonNode schemaFormat = jsonNode.get("schemaFormat"); + JsonNode schema = jsonNode.get("schema"); + + return (schemaFormat != null) && (schema != null); } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java index fedd9281..c10a703c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -1,18 +1,77 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.v2.jackson.ObjectDeserializer; +import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; /** * Serializes message traits list. * * @author Pavel Bodiachevskii */ -public class MessagePayloadDeserializer extends ObjectDeserializer { +public class MessagePayloadDeserializer extends JsonDeserializer { @Override - public Class objectTypeClass() { - return AsyncAPISchema.class; + public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { + ObjectCodec objectCodec = p.getCodec(); + JsonNode node = objectCodec.readTree(p); + + /* + Problem: + Both, Reference class and Schema class have $ref field. + So, this is only reason why I receive next exception: + "com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: + Unrecognized field "title" (class com.asyncapi.v2._6_0.model.Reference), + not marked as ignorable (one known property: "$ref"])" + in case when Schema contains $ref. + Solution: + Try to deserialize reference. In case of exception, try to deserialize it as given ObjectType. In case of + one more exception, throw it. + TODO: Think how to improve. + */ + try { + return chooseKnownPojo(node, objectCodec); + } catch (UnrecognizedPropertyException unrecognizedPropertyException) { + return readAsObject(node, objectCodec); + } + } + + private Object chooseKnownPojo(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { + JsonNode ref = jsonNode.get("$ref"); + try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { + if (isMultiFormatSchema(jsonNode)) { + return jsonParser.readValueAs(MultiFormatSchema.class); + } + + if (ref != null) { + return jsonParser.readValueAs(Reference.class); + } else { + return jsonParser.readValueAs(AsyncAPISchema.class); + } + } + } + + private Object readAsObject(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { + try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { + return jsonParser.readValueAs(AsyncAPISchema.class); + } + } + + private boolean isMultiFormatSchema(@NotNull JsonNode jsonNode) { + JsonNode schemaFormat = jsonNode.get("schemaFormat"); + JsonNode schema = jsonNode.get("schema"); + + return (schemaFormat != null) && (schema != null); } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java index 000da053..8aa12a24 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,19 +1,95 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.Reference; import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import org.jetbrains.annotations.NotNull; -public class ComponentsSchemasDeserializer extends MapOfReferencesOrObjectsDeserializer { +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class ComponentsSchemasDeserializer extends JsonDeserializer { - @Override public Class objectTypeClass() { return AsyncAPISchema.class; } - @Override public Class referenceClass() { return Reference.class; } + @Override + public Map deserialize(JsonParser jsonParser, + DeserializationContext deserializationContext + ) throws IOException, JsonProcessingException { + ObjectCodec objectCodec = jsonParser.getCodec(); + JsonNode map = objectCodec.readTree(jsonParser); + + Map parameters = new HashMap<>(); + + map.fieldNames().forEachRemaining( + fieldName -> { + /* + Problem: + Both, Reference class and Schema class have $ref field. + So, this is only reason why I receive next exception: + "com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: + Unrecognized field "title" (class com.asyncapi.v2._6_0.model.Reference), + not marked as ignorable (one known property: "$ref"])" + in case when Schema contains $ref. + Solution: + Try to deserialize reference. In case of exception, try to deserialize it as given ObjectType. In case of + one more exception, throw it. + TODO: Think how to improve. + */ + try { + parameters.put(fieldName, chooseKnownPojo(map.get(fieldName), objectCodec)); + } catch (IOException ignore) { + try { + parameters.put(fieldName, readAsObject(map.get(fieldName), objectCodec)); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + ); + + return parameters; + } + + private Object chooseKnownPojo(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { + JsonNode ref = jsonNode.get("$ref"); + try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { + if (isMultiFormatSchema(jsonNode)) { + return jsonParser.readValueAs(MultiFormatSchema.class); + } + + if (ref != null) { + return jsonParser.readValueAs(referenceClass()); + } else { + return jsonParser.readValueAs(objectTypeClass()); + } + } + } + + private Object readAsObject(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { + try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { + return jsonParser.readValueAs(objectTypeClass()); + } + } + + private boolean isMultiFormatSchema(@NotNull JsonNode jsonNode) { + JsonNode schemaFormat = jsonNode.get("schemaFormat"); + JsonNode schema = jsonNode.get("schema"); + + return (schemaFormat != null) && (schema != null); + } + } diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java index 132e6fee..e779fb86 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java @@ -1,7 +1,9 @@ package com.asyncapi.v2._6_0.model.channel.message; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessagePayloadDeserializer; @@ -51,7 +53,8 @@ public class Message extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • + *
  • {@link AsyncAPISchema}
    • + *
  • {@link MultiFormatSchema}
    • *
  • {@link Reference}
    • *
*/ @@ -64,9 +67,11 @@ public class Message extends ExtendableObject { * It must match the schema format, including encoding type - e.g Avro should be inlined as either a YAML or JSON object * NOT a string to be parsed as YAML or JSON. *

- * WILL BE: + * MUST BE: *

    - *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • + *
  • {@link AsyncAPISchema}
    • + *
  • {@link MultiFormatSchema}
    • + *
  • {@link Reference}
    • *
*/ @Nullable diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java index 465dbd00..d8d07a2c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java @@ -1,7 +1,9 @@ package com.asyncapi.v2._6_0.model.channel.message; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; @@ -55,7 +57,8 @@ public class MessageTrait extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • + *
  • {@link AsyncAPISchema}
    • + *
  • {@link MultiFormatSchema}
    • *
  • {@link Reference}
    • *
*/ diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index a92120f3..5473e44b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -1,7 +1,9 @@ package com.asyncapi.v2._6_0.model.component; +import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsCorrelationIdsDeserializer; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsMessageTraitsDeserializer; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsMessagesDeserializer; @@ -52,7 +54,8 @@ public class Components extends ExtendableObject { *

* MUST BE: *

    - *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • + *
  • {@link AsyncAPISchema}
    • + *
  • {@link MultiFormatSchema}
    • *
  • {@link Reference}
    • *
*/ From 6de09dc7a859c6d05bdf483b2b8e4134e31e70c2 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 11:39:09 +0400 Subject: [PATCH 078/141] test(schemas): move OpenAPI to schemas package --- .../schema => schemas}/openapi/v3/_0_0/OpenAPISchemaTest.kt | 3 +-- .../{v3/schema => schemas}/openapi/v3/_0_0/SchemaTest.kt | 3 +-- .../multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt | 2 +- .../multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt | 2 +- .../multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt | 2 +- .../multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/openapi/v3/_0_0/OpenAPISchemaTest.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/openapi/v3/_0_0/SchemaTest.kt (98%) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt index ae700ca3..d6a3269e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/OpenAPISchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.schema.openapi.v3._0_0 +package com.asyncapi.schemas.openapi.v3._0_0 -import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema import com.asyncapi.v3.ClasspathUtils import com.asyncapi.v3.schema.SchemaProvider import com.asyncapi.schemas.openapi.v3._0_0.properties.* diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/SchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/SchemaTest.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/SchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/SchemaTest.kt index f151c067..e4f758d3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/openapi/v3/_0_0/SchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/SchemaTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.schema.openapi.v3._0_0 +package com.asyncapi.schemas.openapi.v3._0_0 -import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema import com.asyncapi.v3.schema.SchemaProvider import com.asyncapi.schemas.openapi.v3._0_0.properties.Discriminator import com.asyncapi.schemas.openapi.v3._0_0.properties.ExternalDocumentation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt index 53272391..77ce3838 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.openapi import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema -import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest +import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt index 1cd94c04..6453e178 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.openapi import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema -import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest +import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt index de83517d..69801da6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.openapi import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema -import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest +import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt index 42006511..fad92fb0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.openapi import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema -import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest +import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments From 3163a8b63c038d227c3a3a39520984d38923c08c Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 11:41:13 +0400 Subject: [PATCH 079/141] test(schemas): move Avro to schemas package --- .../asyncapi/{v3/schema => schemas}/avro/AvroSchemasProvider.kt | 2 +- .../kotlin/com/asyncapi/{v3/schema => schemas}/avro/AvroTest.kt | 2 +- .../multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt | 2 +- .../multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt | 2 +- .../multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt | 2 +- .../multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt | 2 +- .../multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt | 2 +- .../schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt | 2 +- .../schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt | 2 +- .../schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/avro/AvroSchemasProvider.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/avro/AvroTest.kt (99%) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroSchemasProvider.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroSchemasProvider.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroSchemasProvider.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroSchemasProvider.kt index 1150ed54..28153217 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroSchemasProvider.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroSchemasProvider.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.avro +package com.asyncapi.schemas.avro import com.asyncapi.schemas.avro.v1._9_0.* diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroTest.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroTest.kt index 37fb8876..7eb641ea 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/avro/AvroTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.avro +package com.asyncapi.schemas.avro import com.asyncapi.v3.ClasspathUtils import com.asyncapi.schemas.avro.v1._9_0.AvroSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt index 81b95070..e44aaaf6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.avro -import com.asyncapi.v3.schema.avro.AvroSchemasProvider +import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt index a68a1e3a..df3188f4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.avro -import com.asyncapi.v3.schema.avro.AvroSchemasProvider +import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt index d3a269f1..76fe78f6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.avro -import com.asyncapi.v3.schema.avro.AvroSchemasProvider +import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt index 9baa7d4e..33c20168 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.avro -import com.asyncapi.v3.schema.avro.AvroSchemasProvider +import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt index 891332a8..9b0d5ea6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.avro -import com.asyncapi.v3.schema.avro.AvroSchemasProvider +import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt index b95adee3..5b6ef9de 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.avro -import com.asyncapi.v3.schema.avro.AvroSchemasProvider +import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt index 38a9ccc3..bdb87a62 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.avro -import com.asyncapi.v3.schema.avro.AvroSchemasProvider +import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt index 8121cbe4..627cb5f1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.avro -import com.asyncapi.v3.schema.avro.AvroSchemasProvider +import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest From 5e08f06c9f4f87578ed8b899be1952b3bbcd135a Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 11:59:30 +0400 Subject: [PATCH 080/141] test(schemas): fix tests --- .../com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt | 2 +- .../kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt | 4 ++-- .../src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt | 2 +- .../test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt | 8 ++++---- .../com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt | 6 +++--- .../com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt | 6 +++--- .../examples/v2/_6_0/StreetlightsOperationSecurity.kt | 6 +++--- .../com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt index 5301d09c..df71b7d2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt @@ -105,7 +105,7 @@ class ApplicationHeaders: AbstractExampleValidationTest() { )) .build() ) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(Reference("#/components/schemas/lightMeasuredPayload")) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt index ccd5a5a3..8f2188ee 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt @@ -110,7 +110,7 @@ class CorrelationId: AbstractExampleValidationTest() { "\$message.header#/MQMD/CorrelId" )) .contentType("application/json") - .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(Reference("#/components/schemas/lightMeasuredPayload")) .build() ), Pair("dimLight", Message.builder() @@ -118,7 +118,7 @@ class CorrelationId: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .correlationId(Reference("#/components/correlationIds/sentAtCorrelator")) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(Reference("#/components/schemas/dimLightPayload")) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt index 19466f8f..95079726 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt @@ -37,7 +37,7 @@ class Not: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(AsyncAPISchema.builder().ref("#/components/schemas/testSchema").build()) + .payload(Reference("#/components/schemas/testSchema")) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt index f42dac69..616c7abc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt @@ -35,10 +35,10 @@ class OneOf: AbstractExampleValidationTest() { .subscribe(Operation.builder() .message(OneOfMessages(listOf( Message.builder() - .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build()) + .payload(Reference("#/components/schemas/objectWithKey")) .build(), Message.builder() - .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build()) + .payload(Reference("#/components/schemas/objectWithKey2")) .build(), ))) .build() @@ -62,11 +62,11 @@ class OneOf: AbstractExampleValidationTest() { .build() ), Pair("testMessage1", Message.builder() - .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build()) + .payload(Reference("#/components/schemas/objectWithKey")) .build() ), Pair("testMessage2", Message.builder() - .payload(AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build()) + .payload(Reference("#/components/schemas/objectWithKey2")) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt index f78e54ab..4bfcf7e4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt @@ -154,7 +154,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .contentType("application/json") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(Reference("#/components/schemas/lightMeasuredPayload")) .build() ), Pair("turnOnOff", @@ -163,7 +163,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .title("Turn on/off") .summary("Command a particular streetlight to turn the lights on or off.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/turnOnOffPayload").build()) + .payload(Reference("#/components/schemas/turnOnOffPayload")) .build() ), Pair("dimLight", @@ -172,7 +172,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(Reference("#/components/schemas/dimLightPayload")) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt index e1204b33..0b008e2b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt @@ -146,7 +146,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .contentType("application/json") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(Reference("#/components/schemas/lightMeasuredPayload")) .build() ), Pair("turnOnOff", @@ -155,7 +155,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .title("Turn on/off") .summary("Command a particular streetlight to turn the lights on or off.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/turnOnOffPayload").build()) + .payload(Reference("#/components/schemas/turnOnOffPayload")) .build() ), Pair("dimLight", @@ -164,7 +164,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(Reference("#/components/schemas/dimLightPayload")) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt index 79a56696..7d516dd5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt @@ -140,7 +140,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .summary("Inform about environmental lighting conditions of a particular streetlight.") .contentType("application/json") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/lightMeasuredPayload").build()) + .payload(Reference("#/components/schemas/lightMeasuredPayload")) .build() ), Pair("turnOnOff", @@ -149,7 +149,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .title("Turn on/off") .summary("Command a particular streetlight to turn the lights on or off.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/turnOnOffPayload").build()) + .payload(Reference("#/components/schemas/turnOnOffPayload")) .build() ), Pair("dimLight", @@ -158,7 +158,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .title("Dim light") .summary("Command a particular streetlight to dim the lights.") .traits(listOf(Reference("#/components/messageTraits/commonHeaders"))) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/dimLightPayload").build()) + .payload(Reference("#/components/schemas/dimLightPayload")) .build() ) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt index d7daea45..82359b67 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt @@ -222,7 +222,7 @@ class WebsocketGemini: AbstractExampleValidationTest() { .description( "The initial response message will show the existing state of the order book. Subsequent messages will show all executed trades, as well as all other changes to the order book from orders placed or canceled.\n" ) - .payload(AsyncAPISchema.builder().ref("#/components/schemas/market").build()) + .payload(Reference("#/components/schemas/market")) .examples(listOf( MessageExample.builder() .name("updateMessage") From d279fa9737523c5a0909cfaa9796f62ee98bb481 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 12:53:22 +0400 Subject: [PATCH 081/141] test(schemas): move Json Properties to schemas package --- .../{v3/schema => schemas}/ReadJsonPropertiesTest.kt | 7 +++---- .../asyncapi/{v3/schema => schemas}/ReadJsonSchemaTest.kt | 7 +++---- .../{v3/schema => schemas}/json/ArraysSchemaTest.kt | 2 +- .../{v3/schema => schemas}/json/ComplexObjectTest.kt | 2 +- .../schema => schemas}/json/ConditionalValidationIfElse.kt | 2 +- .../json/Draft07CoreSchemaMetaSchemaTest.kt | 2 +- .../{v3/schema => schemas}/json/EnumeratedValuesTest.kt | 2 +- .../com/asyncapi/{v3/schema => schemas}/json/PersonTest.kt | 2 +- .../{v3/schema => schemas}/json/RegexPatternTest.kt | 2 +- .../json/properties/ConstDefaultExamplesArrayTest.kt | 2 +- .../ConstDefaultExamplesBigDecimalMaximumTest.kt | 2 +- .../ConstDefaultExamplesBigDecimalMinimumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesBigDecimalTest.kt | 2 +- .../ConstDefaultExamplesBigIntegerMaximumTest.kt | 2 +- .../ConstDefaultExamplesBigIntegerMinimumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesBigIntegerTest.kt | 2 +- .../properties/ConstDefaultExamplesBooleanFalseTest.kt | 2 +- .../json/properties/ConstDefaultExamplesBooleanTrueTest.kt | 2 +- .../properties/ConstDefaultExamplesDoubleMaximumTest.kt | 2 +- .../properties/ConstDefaultExamplesDoubleMinimumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesDoubleTest.kt | 2 +- .../json/properties/ConstDefaultExamplesIntMaximumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesIntMinimumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesIntTest.kt | 2 +- .../json/properties/ConstDefaultExamplesNullTest.kt | 2 +- .../json/properties/ConstDefaultExamplesObjectTest.kt | 2 +- .../multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt | 2 +- .../multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt | 2 +- .../multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt | 2 +- .../multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt | 2 +- .../multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt | 2 +- .../multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt | 2 +- .../multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt | 2 +- .../multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt | 2 +- .../schema/multiformat/asyncapi/EmptySchemaFormatTest.kt | 2 +- .../v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt | 2 +- .../schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt | 2 +- .../v3/schema/multiformat/json/JsonFormatSchemaTest.kt | 2 +- 38 files changed, 42 insertions(+), 44 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/ReadJsonPropertiesTest.kt (96%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/ReadJsonSchemaTest.kt (95%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/ArraysSchemaTest.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/ComplexObjectTest.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/ConditionalValidationIfElse.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/Draft07CoreSchemaMetaSchemaTest.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/EnumeratedValuesTest.kt (97%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/PersonTest.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/RegexPatternTest.kt (97%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesArrayTest.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt (94%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt (94%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesBigDecimalTest.kt (94%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt (94%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt (94%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesBigIntegerTest.kt (94%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesBooleanFalseTest.kt (93%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesBooleanTrueTest.kt (93%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt (93%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt (93%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesDoubleTest.kt (93%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesIntMaximumTest.kt (93%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesIntMinimumTest.kt (93%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesIntTest.kt (93%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesNullTest.kt (93%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/json/properties/ConstDefaultExamplesObjectTest.kt (95%) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt similarity index 96% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt index 164ae874..f8b66343 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonPropertiesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt @@ -1,9 +1,8 @@ -package com.asyncapi.v3.schema +package com.asyncapi.schemas -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.properties.* import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.json.properties.* +import com.asyncapi.v3.schema.SchemaProvider import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt similarity index 95% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt index 0c5ade39..a730b6fe 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/ReadJsonSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt @@ -1,9 +1,8 @@ -package com.asyncapi.v3.schema +package com.asyncapi.schemas -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.* import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.json.* +import com.asyncapi.v3.schema.SchemaProvider import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.* diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt index 4d40e881..0ed80fa4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ArraysSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json +package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt index c856a8a5..880efbc3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ComplexObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json +package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt index 883e71a5..9ef09bbb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/ConditionalValidationIfElse.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json +package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt index 8851027d..a72e5d0e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/Draft07CoreSchemaMetaSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json +package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt similarity index 97% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt index 1c040c7f..a011006b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/EnumeratedValuesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json +package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt index 1195b291..ddec045a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/PersonTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json +package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt similarity index 97% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt index 919c9647..a058741d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/RegexPatternTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json +package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt index a5fe5d89..ddb53a64 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesArrayTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt similarity index 94% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt index d0c61702..d38646a9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt similarity index 94% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt index afae4292..270f225a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt similarity index 94% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt index 9ff78c61..a380df37 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigDecimalTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt similarity index 94% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt index afe55aab..ddaee1bd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt similarity index 94% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt index 06756650..1a521004 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt similarity index 94% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt index d4ee66ef..31c20d99 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBigIntegerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt similarity index 93% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt index 1d9270b7..a6153d0c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanFalseTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt similarity index 93% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt index bc800129..6f45fb89 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesBooleanTrueTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt similarity index 93% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt index 53cedb0b..63c2d023 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt similarity index 93% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt index 45f9649a..d984d36b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt similarity index 93% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt index 16fe78dc..0c2a0529 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesDoubleTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt similarity index 93% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt index 8bf20632..09bceb1f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt similarity index 93% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt index bc00c0ac..1fd26299 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt similarity index 93% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt index da12f320..236c7544 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesIntTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt similarity index 93% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt index 1c51cd2e..6afa750a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesNullTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt similarity index 95% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt index 8eb2fcfd..3c5ecf96 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/json/properties/ConstDefaultExamplesObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.json.properties +package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt index 4ebb0d84..0375535f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt index f63f6edc..fb008923 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt index 20fa4ea4..6dad5eda 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt index 8a0286ae..7a39c05a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt index e1fd15d9..a1e3d416 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt index 0e538842..406a99ba 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt index a56552eb..eac4c848 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt index 8b610ed0..57282e77 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt index 8e465273..83678c3f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt index 757a93c9..1892d620 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt index 9b3bccc8..cb4647ea 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3.schema.multiformat.asyncapi -import com.asyncapi.v3.schema.json.* +import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt index d2d622e4..a58491dc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3.schema.multiformat.json +import com.asyncapi.schemas.json.* import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.json.* import com.asyncapi.schemas.multiformat.JsonFormatSchema import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper From 1a33cc45781d30145327fea8da199b4143879935 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 2 May 2024 12:59:10 +0400 Subject: [PATCH 082/141] test(schemas): move Multi Format Schema to schemas package --- .../asyncapi/schemas/ReadJsonPropertiesTest.kt | 1 - .../com/asyncapi/schemas/ReadJsonSchemaTest.kt | 1 - .../{v3/schema => schemas}/SchemaProvider.kt | 4 +--- .../asyncapi/schemas/json/ArraysSchemaTest.kt | 2 +- .../asyncapi/schemas/json/ComplexObjectTest.kt | 2 +- .../json/ConditionalValidationIfElse.kt | 2 +- .../json/Draft07CoreSchemaMetaSchemaTest.kt | 2 +- .../schemas/json/EnumeratedValuesTest.kt | 2 +- .../com/asyncapi/schemas/json/PersonTest.kt | 2 +- .../asyncapi/schemas/json/RegexPatternTest.kt | 2 +- .../ConstDefaultExamplesArrayTest.kt | 2 +- ...onstDefaultExamplesBigDecimalMaximumTest.kt | 2 +- ...onstDefaultExamplesBigDecimalMinimumTest.kt | 2 +- .../ConstDefaultExamplesBigDecimalTest.kt | 2 +- ...onstDefaultExamplesBigIntegerMaximumTest.kt | 2 +- ...onstDefaultExamplesBigIntegerMinimumTest.kt | 2 +- .../ConstDefaultExamplesBigIntegerTest.kt | 2 +- .../ConstDefaultExamplesBooleanFalseTest.kt | 2 +- .../ConstDefaultExamplesBooleanTrueTest.kt | 2 +- .../ConstDefaultExamplesDoubleMaximumTest.kt | 2 +- .../ConstDefaultExamplesDoubleMinimumTest.kt | 2 +- .../ConstDefaultExamplesDoubleTest.kt | 2 +- .../ConstDefaultExamplesIntMaximumTest.kt | 2 +- .../ConstDefaultExamplesIntMinimumTest.kt | 2 +- .../properties/ConstDefaultExamplesIntTest.kt | 2 +- .../properties/ConstDefaultExamplesNullTest.kt | 2 +- .../ConstDefaultExamplesObjectTest.kt | 2 +- .../multiformat/MultiFormatSchemaTest.kt | 18 +++++++++--------- .../asyncapi/AsyncAPIFormatSchemaTest.kt | 2 +- .../asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt | 8 ++++---- .../asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt | 2 +- .../asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt | 8 ++++---- .../asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt | 8 ++++---- .../asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt | 2 +- .../asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt | 2 +- .../asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt | 8 ++++---- .../asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt | 2 +- .../asyncapi/EmptySchemaFormatTest.kt | 2 +- .../asyncapi/NullSchemaFormatTest.kt | 8 ++++---- .../asyncapi/WithoutSchemaFormatTest.kt | 8 ++++---- .../multiformat/avro/AvroFormatSchemaTest.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_10_0Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_10_1Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_10_2Test.kt | 8 ++++---- .../avro/AvroSchemaFormatSchemaV1_11_0Test.kt | 8 ++++---- .../avro/AvroSchemaFormatSchemaV1_11_1Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_9_0Test.kt | 8 ++++---- .../avro/AvroSchemaFormatSchemaV1_9_1Test.kt | 8 ++++---- .../avro/AvroSchemaFormatSchemaV1_9_2Test.kt | 2 +- .../multiformat/json/JsonFormatSchemaTest.kt | 6 +++--- .../openapi/OpenAPIFormatSchemaTest.kt | 2 +- .../openapi/OpenAPIFormatSchemaV3_0_0Test.kt | 2 +- .../openapi/OpenAPIFormatSchemaV3_0_1Test.kt | 2 +- .../openapi/OpenAPIFormatSchemaV3_0_2Test.kt | 2 +- .../openapi/OpenAPIFormatSchemaV3_0_3Test.kt | 2 +- .../openapi/v3/_0_0/OpenAPISchemaTest.kt | 2 +- .../schemas/openapi/v3/_0_0/SchemaTest.kt | 2 +- .../properties/ExampleEnumDefaultArrayTest.kt | 2 +- .../properties/ExampleEnumDefaultNullTest.kt | 2 +- 59 files changed, 97 insertions(+), 101 deletions(-) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/SchemaProvider.kt (88%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/MultiFormatSchemaTest.kt (85%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt (95%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt (96%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt (96%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt (96%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt (96%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/EmptySchemaFormatTest.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/NullSchemaFormatTest.kt (94%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/asyncapi/WithoutSchemaFormatTest.kt (94%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/avro/AvroFormatSchemaTest.kt (95%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt (99%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/json/JsonFormatSchemaTest.kt (96%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/openapi/OpenAPIFormatSchemaTest.kt (95%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt (98%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/schema => schemas}/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt (98%) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt index f8b66343..6b77553f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt @@ -2,7 +2,6 @@ package com.asyncapi.schemas import com.asyncapi.schemas.json.properties.* import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.SchemaProvider import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt index a730b6fe..e4420412 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt @@ -2,7 +2,6 @@ package com.asyncapi.schemas import com.asyncapi.schemas.json.* import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.SchemaProvider import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.* diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt similarity index 88% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt index 65f11cc1..1d9b05d3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt @@ -1,7 +1,5 @@ -package com.asyncapi.v3.schema +package com.asyncapi.schemas -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import com.asyncapi.schemas.multiformat.JsonFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt index 0ed80fa4..b637f98f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ArraysSchemaTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt index 880efbc3..fcc32bbf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal class ComplexObjectTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt index 9ef09bbb..10d5ab5e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConditionalValidationIfElse: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt index a72e5d0e..5713470e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal class Draft07CoreSchemaMetaSchemaTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt index a011006b..b6328c0c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class EnumeratedValuesTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt index ddec045a..0eba35b6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal class PersonTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt index a058741d..7e61fd45 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class RegexPatternTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt index ddb53a64..7b8bf8fa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesArrayTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt index d38646a9..00656f29 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal class ConstDefaultExamplesBigDecimalMaximumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt index 270f225a..4ccde37b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal class ConstDefaultExamplesBigDecimalMinimumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt index a380df37..943b9bc1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal class ConstDefaultExamplesBigDecimalTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt index ddaee1bd..49cc9d88 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import java.math.BigInteger class ConstDefaultExamplesBigIntegerMaximumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt index 1a521004..337e3f1f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import java.math.BigInteger class ConstDefaultExamplesBigIntegerMinimumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt index 31c20d99..c3f7ccab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import java.math.BigInteger class ConstDefaultExamplesBigIntegerTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt index a6153d0c..4d35eee9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesBooleanFalseTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt index 6f45fb89..2675cfec 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesBooleanTrueTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt index 63c2d023..fd9bec12 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesDoubleMaximumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt index d984d36b..d7c31e88 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesDoubleMinimumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt index 0c2a0529..496b4006 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesDoubleTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt index 09bceb1f..c966b87e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesIntMaximumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt index 1fd26299..f6c2c6f0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesIntMinimumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt index 236c7544..604666e8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesIntTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt index 6afa750a..91a97588 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesNullTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt index 3c5ecf96..c760c258 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesObjectTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/MultiFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/MultiFormatSchemaTest.kt similarity index 85% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/MultiFormatSchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/MultiFormatSchemaTest.kt index 5f4132bd..9280f8aa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/MultiFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/MultiFormatSchemaTest.kt @@ -1,12 +1,12 @@ -package com.asyncapi.v3.schema.multiformat - -import com.asyncapi.v3.schema.multiformat.asyncapi.* -import com.asyncapi.v3.schema.multiformat.avro.* -import com.asyncapi.v3.schema.multiformat.json.JsonFormatSchemaTest -import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_0Test -import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_1Test -import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_2Test -import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_3Test +package com.asyncapi.schemas.multiformat + +import com.asyncapi.schemas.multiformat.asyncapi.* +import com.asyncapi.schemas.multiformat.avro.* +import com.asyncapi.schemas.multiformat.json.JsonFormatSchemaTest +import com.asyncapi.schemas.multiformat.openapi.OpenAPIFormatSchemaV3_0_0Test +import com.asyncapi.schemas.multiformat.openapi.OpenAPIFormatSchemaV3_0_1Test +import com.asyncapi.schemas.multiformat.openapi.OpenAPIFormatSchemaV3_0_2Test +import com.asyncapi.schemas.multiformat.openapi.OpenAPIFormatSchemaV3_0_3Test import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt similarity index 95% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt index 9aa52478..a9522f64 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.v3.ClasspathUtils import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt similarity index 96% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt index 0375535f..d416c7e6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class AsyncAPIFormatSchemaV2_0_0Test: AsyncAPIFormatSchemaTest() { +abstract class AsyncAPIFormatSchemaV2_0_0Test: com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaTest() { - @ArgumentsSource(JsonFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaV2_0_0Test.JsonFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( asyncAPIFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class AsyncAPIFormatSchemaV2_0_0Test: AsyncAPIFormatSchemaTest() { compareSchemas(asyncAPIFormatSchemaToCompareWithFilePath, asyncAPIFormatSchema) } - @ArgumentsSource(YamlFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaV2_0_0Test.YamlFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( asyncAPIFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt index fb008923..c1917255 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt similarity index 96% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt index 6dad5eda..eda590d6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class AsyncAPIFormatSchemaV2_2_0Test: AsyncAPIFormatSchemaTest() { +abstract class AsyncAPIFormatSchemaV2_2_0Test: com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaTest() { - @ArgumentsSource(JsonFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaV2_2_0Test.JsonFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( asyncAPIFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class AsyncAPIFormatSchemaV2_2_0Test: AsyncAPIFormatSchemaTest() { compareSchemas(asyncAPIFormatSchemaToCompareWithFilePath, asyncAPIFormatSchema) } - @ArgumentsSource(YamlFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaV2_2_0Test.YamlFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( asyncAPIFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt similarity index 96% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt index 7a39c05a..a18fd42d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class AsyncAPIFormatSchemaV2_3_0Test: AsyncAPIFormatSchemaTest() { +abstract class AsyncAPIFormatSchemaV2_3_0Test: com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaTest() { - @ArgumentsSource(JsonFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaV2_3_0Test.JsonFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( asyncAPIFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class AsyncAPIFormatSchemaV2_3_0Test: AsyncAPIFormatSchemaTest() { compareSchemas(asyncAPIFormatSchemaToCompareWithFilePath, asyncAPIFormatSchema) } - @ArgumentsSource(YamlFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaV2_3_0Test.YamlFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( asyncAPIFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt index a1e3d416..4677c2ad 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt index 406a99ba..9b6d8bcf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt similarity index 96% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt index eac4c848..c6fa3aea 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class AsyncAPIFormatSchemaV2_6_0Test: AsyncAPIFormatSchemaTest() { +abstract class AsyncAPIFormatSchemaV2_6_0Test: com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaTest() { - @ArgumentsSource(JsonFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaV2_6_0Test.JsonFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( asyncAPIFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class AsyncAPIFormatSchemaV2_6_0Test: AsyncAPIFormatSchemaTest() { compareSchemas(asyncAPIFormatSchemaToCompareWithFilePath, asyncAPIFormatSchema) } - @ArgumentsSource(YamlFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaV2_6_0Test.YamlFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( asyncAPIFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt index 57282e77..cecce11d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt index 83678c3f..06cb2a07 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/EmptySchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt similarity index 94% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt index 1892d620..95eefc1e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/NullSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class NullSchemaFormatTest: AsyncAPIFormatSchemaTest() { +abstract class NullSchemaFormatTest: com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaTest() { - @ArgumentsSource(Json::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.NullSchemaFormatTest.Json::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( asyncAPIFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class NullSchemaFormatTest: AsyncAPIFormatSchemaTest() { compareSchemas(asyncAPIFormatSchemaToCompareWithFilePath, asyncAPIFormatSchema) } - @ArgumentsSource(Yaml::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.NullSchemaFormatTest.Yaml::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( asyncAPIFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt similarity index 94% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt index cb4647ea..72c2a7a2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/asyncapi/WithoutSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.asyncapi +package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class WithoutSchemaFormatTest: AsyncAPIFormatSchemaTest() { +abstract class WithoutSchemaFormatTest: com.asyncapi.schemas.multiformat.asyncapi.AsyncAPIFormatSchemaTest() { - @ArgumentsSource(Json::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.WithoutSchemaFormatTest.Json::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( asyncAPIFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class WithoutSchemaFormatTest: AsyncAPIFormatSchemaTest() { compareSchemas(asyncAPIFormatSchemaToCompareWithFilePath, asyncAPIFormatSchema) } - @ArgumentsSource(Yaml::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.asyncapi.WithoutSchemaFormatTest.Yaml::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( asyncAPIFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroFormatSchemaTest.kt similarity index 95% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroFormatSchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroFormatSchemaTest.kt index 4619d886..d1c56ada 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroFormatSchemaTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.avro +package com.asyncapi.schemas.multiformat.avro import com.asyncapi.v3.ClasspathUtils import com.asyncapi.schemas.multiformat.AvroFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt index e44aaaf6..55cc6569 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.avro +package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt index df3188f4..a5a8bd3c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.avro +package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt index 76fe78f6..d37f46ec 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.avro +package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class AvroFormatSchemaV1_10_2Test: AvroFormatSchemaTest() { +abstract class AvroFormatSchemaV1_10_2Test: com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaTest() { - @ArgumentsSource(JsonFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaV1_10_2Test.JsonFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( avroFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class AvroFormatSchemaV1_10_2Test: AvroFormatSchemaTest() { compareSchemas(avroFormatSchemaToCompareWithFilePath, avroFormatSchema) } - @ArgumentsSource(YamlFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaV1_10_2Test.YamlFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( avroFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt index 33c20168..54c3fc00 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.avro +package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class AvroFormatSchemaV1_11_0Test: AvroFormatSchemaTest() { +abstract class AvroFormatSchemaV1_11_0Test: com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaTest() { - @ArgumentsSource(JsonFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaV1_11_0Test.JsonFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( avroFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class AvroFormatSchemaV1_11_0Test: AvroFormatSchemaTest() { compareSchemas(avroFormatSchemaToCompareWithFilePath, avroFormatSchema) } - @ArgumentsSource(YamlFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaV1_11_0Test.YamlFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( avroFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt index 9b0d5ea6..659fce28 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.avro +package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt index 5b6ef9de..134a184d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.avro +package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class AvroFormatSchemaV1_9_0Test: AvroFormatSchemaTest() { +abstract class AvroFormatSchemaV1_9_0Test: com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaTest() { - @ArgumentsSource(JsonFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaV1_9_0Test.JsonFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( avroFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class AvroFormatSchemaV1_9_0Test: AvroFormatSchemaTest() { compareSchemas(avroFormatSchemaToCompareWithFilePath, avroFormatSchema) } - @ArgumentsSource(YamlFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaV1_9_0Test.YamlFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( avroFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt index bdb87a62..6e4581a3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.avro +package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema @@ -9,9 +9,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider import org.junit.jupiter.params.provider.ArgumentsSource import java.util.stream.Stream -abstract class AvroFormatSchemaV1_9_1Test: AvroFormatSchemaTest() { +abstract class AvroFormatSchemaV1_9_1Test: com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaTest() { - @ArgumentsSource(JsonFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaV1_9_1Test.JsonFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseJson( avroFormatSchemaToCompareWithFilePath: String, @@ -20,7 +20,7 @@ abstract class AvroFormatSchemaV1_9_1Test: AvroFormatSchemaTest() { compareSchemas(avroFormatSchemaToCompareWithFilePath, avroFormatSchema) } - @ArgumentsSource(YamlFormat::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.avro.AvroFormatSchemaV1_9_1Test.YamlFormat::class) @ParameterizedTest(name = "Read: {0}") override fun parseYaml( avroFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt similarity index 99% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt index 627cb5f1..829733a3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.avro +package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider import com.asyncapi.schemas.multiformat.AvroFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt similarity index 96% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt index a58491dc..90116eef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/json/JsonFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.json +package com.asyncapi.schemas.multiformat.json import com.asyncapi.schemas.json.* import com.asyncapi.v3.ClasspathUtils @@ -30,7 +30,7 @@ abstract class JsonFormatSchemaTest { Assertions.assertEquals(schema, schemaToCheck) } - @ArgumentsSource(Json::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.json.JsonFormatSchemaTest.Json::class) @ParameterizedTest(name = "Read: {0}") fun parseJson( jsonFormatSchemaToCompareWithFilePath: String, @@ -40,7 +40,7 @@ abstract class JsonFormatSchemaTest { } - @ArgumentsSource(Yaml::class) + @ArgumentsSource(com.asyncapi.schemas.multiformat.json.JsonFormatSchemaTest.Yaml::class) @ParameterizedTest(name = "Read: {0}") fun parseYaml( jsonFormatSchemaToCompareWithFilePath: String, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaTest.kt similarity index 95% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaTest.kt index 07c93aa2..c4339575 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.openapi +package com.asyncapi.schemas.multiformat.openapi import com.asyncapi.v3.ClasspathUtils import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt index 77ce3838..5e6dcd8f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.openapi +package com.asyncapi.schemas.multiformat.openapi import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt index 6453e178..3d4b50d6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.openapi +package com.asyncapi.schemas.multiformat.openapi import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt index 69801da6..2e80923d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.openapi +package com.asyncapi.schemas.multiformat.openapi import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt similarity index 98% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt index fad92fb0..81b5346b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v3.schema.multiformat.openapi +package com.asyncapi.schemas.multiformat.openapi import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt index d6a3269e..6610b7fd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.openapi.v3._0_0 import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import com.asyncapi.schemas.openapi.v3._0_0.properties.* import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/SchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/SchemaTest.kt index e4f758d3..fa827c4f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/SchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/SchemaTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.openapi.v3._0_0 -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import com.asyncapi.schemas.openapi.v3._0_0.properties.Discriminator import com.asyncapi.schemas.openapi.v3._0_0.properties.ExternalDocumentation import com.asyncapi.schemas.openapi.v3._0_0.properties.XML diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt index ffec5f32..ab6cdddb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultArrayTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.openapi.v3._0_0.properties -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema class ExampleEnumDefaultArrayTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt index aad61331..1b4bf7d2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExampleEnumDefaultNullTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.openapi.v3._0_0.properties -import com.asyncapi.v3.schema.SchemaProvider +import com.asyncapi.schemas.SchemaProvider import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema class ExampleEnumDefaultNullTest: SchemaProvider { From b87e57c1988bbaf0f5e094b3bc591edbf8a61e83 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Fri, 3 May 2024 06:52:57 +0400 Subject: [PATCH 083/141] feat(schemas): Message's payload can hold Reference and OpenAPI, AsyncAPI, Avro and Json schemas --- .../asyncapi/schemas/ExtendableObject.java | 2 +- .../channel/message/MessageDeserializer.java | 298 ++++++++++++++++++ .../message/MessageHeadersDeserializer.java | 66 +--- .../message/MessagePayloadDeserializer.java | 77 ----- .../_6_0/model/channel/message/Message.java | 26 +- .../model/channel/message/MessageTrait.java | 1 - .../examples/v2/_6_0/GitterStreaming.kt | 4 +- .../v2/_6_0/SchemaFormatAsyncAPIPayload.kt | 88 ++++++ .../v2/_6_0/SchemaFormatAvroPayload.kt | 90 ++++++ .../v2/_6_0/SchemaFormatJsonSchemaPayload.kt | 87 +++++ .../v2/_6_0/SchemaFormatOpenAPIPayload.kt | 84 +++++ .../SchemaFormatReferenceToAsyncAPIPayload.kt | 61 ++++ .../SchemaFormatReferenceToAvroPayload.kt | 61 ++++ ...chemaFormatReferenceToJsonSchemaPayload.kt | 61 ++++ .../SchemaFormatReferenceToOpenAPIPayload.kt | 63 ++++ .../_6_0/model/channel/message/MessageTest.kt | 2 +- .../model/channel/message/MessageTraitTest.kt | 2 +- .../examples/v2.6.0/gitter-streaming.yml | 4 +- .../schemaFormat - asyncapi payload.yml | 38 +++ .../v2.6.0/schemaFormat - avro payload.yml | 41 +++ .../schemaFormat - json schema payload.yml | 38 +++ .../v2.6.0/schemaFormat - openapi payload.yml | 36 +++ ...Format - reference to asyncapi payload.yml | 24 ++ ...hemaFormat - reference to avro payload.yml | 24 ++ ...mat - reference to json schema payload.yml | 24 ++ ...aFormat - reference to openapi payload.yml | 27 ++ .../v2/2.6.0/model/asyncapi - extended.json | 12 +- .../model/asyncapi - wrongly extended.json | 12 +- .../json/v2/2.6.0/model/asyncapi.json | 12 +- .../model/channel/channelItem - extended.json | 4 +- .../channelItem - wrongly extended.json | 4 +- .../v2/2.6.0/model/channel/channelItem.json | 4 +- .../channel/message/message - extended.json | 2 +- .../message/message - wrongly extended.json | 2 +- .../2.6.0/model/channel/message/message.json | 2 +- .../message/messageTrait - extended.json | 2 +- .../messageTrait - wrongly extended.json | 2 +- .../model/channel/message/messageTrait.json | 2 +- .../model/channel/message/oneOfMessages.json | 2 +- .../operation with message - extended.json | 2 +- ...ation with message - wrongly extended.json | 2 +- .../operation/operation with message.json | 2 +- ...eration with oneOf message - extended.json | 2 +- ...with oneOf message - wrongly extended.json | 2 +- .../operation with oneOf message.json | 2 +- .../components/components - extended.json | 8 +- .../components - wrongly extended.json | 8 +- .../v2/2.6.0/model/components/components.json | 8 +- 48 files changed, 1218 insertions(+), 209 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAvroPayload.kt create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatOpenAPIPayload.kt create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAsyncAPIPayload.kt create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAvroPayload.kt create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToJsonSchemaPayload.kt create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToOpenAPIPayload.kt create mode 100644 asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - asyncapi payload.yml create mode 100644 asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - avro payload.yml create mode 100644 asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - json schema payload.yml create mode 100644 asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - openapi payload.yml create mode 100644 asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to asyncapi payload.yml create mode 100644 asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to avro payload.yml create mode 100644 asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to json schema payload.yml create mode 100644 asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to openapi payload.yml diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java index e41657c8..9b833583 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java @@ -31,7 +31,7 @@ @JsonIgnoreProperties({"extensionFields"}) public class ExtendableObject { - private static final Pattern extensionPropertyNamePattern = Pattern.compile("^x-[\\w.\\x2d_]+$"); + public static final Pattern extensionPropertyNamePattern = Pattern.compile("^x-[\\w.\\x2d_]+$"); /** * Extension fields in the form x-extension-field-name for the exposed API. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java new file mode 100644 index 00000000..4694f5e0 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java @@ -0,0 +1,298 @@ +package com.asyncapi.v2._6_0.jackson.model.channel.message; + +import com.asyncapi.bindings.MessageBindingsDeserializer; +import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.JsonSchema; +import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; +import com.asyncapi.v2._6_0.model.ExternalDocumentation; +import com.asyncapi.v2._6_0.model.Tag; +import com.asyncapi.v2._6_0.model.channel.message.Message; +import com.asyncapi.v2._6_0.model.channel.message.MessageExample; +import com.fasterxml.jackson.core.JacksonException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeType; + +import java.io.IOException; +import java.util.*; +import java.util.stream.Collectors; + +/** + * Deserializes Message + *

+ * TODO: Fix this + */ +public class MessageDeserializer extends JsonDeserializer { + + private static final List propertiesToIgnore = Arrays.asList( + "messageId", + "headers", + "payload", + "correlationId", + "schemaFormat", + "contentType", + "name", + "title", + "summary", + "description", + "tags", + "externalDocs", + "bindings", + "tags", + "examples", + "traits" + ); + + private String string(JsonNode node, ObjectCodec objectCodec) throws IOException { + if (node == null) { + return null; + } + + try (JsonParser jsonParser = node.traverse(objectCodec)) { + return jsonParser.readValueAs(String.class); + } + } + + private Object headers(JsonNode node, ObjectCodec objectCodec, DeserializationContext deserializationContext) throws IOException { + if (node == null) { + return null; + } + + try (JsonParser jsonParser = node.traverse(objectCodec)) { + MessageHeadersDeserializer deserializer = new MessageHeadersDeserializer(); + + return deserializer.deserialize(jsonParser, deserializationContext); + } + } + + private Object correlationId(JsonNode node, ObjectCodec objectCodec, DeserializationContext deserializationContext) throws IOException { + if (node == null) { + return null; + } + + try (JsonParser jsonParser = node.traverse(objectCodec)) { + MessageCorrelationIdDeserializer deserializer = new MessageCorrelationIdDeserializer(); + + return deserializer.deserialize(jsonParser, deserializationContext); + } + } + + private List tags(JsonNode node, ObjectCodec objectCodec) throws IOException { + if (node == null) { + return null; + } + + try (JsonParser jsonParser = node.traverse(objectCodec)) { + return jsonParser.readValueAs(new TypeReference>() {}); + } + } + + private ExternalDocumentation externalDocs(JsonNode node, ObjectCodec objectCodec) throws IOException { + if (node == null) { + return null; + } + + try (JsonParser jsonParser = node.traverse(objectCodec)) { + return jsonParser.readValueAs(ExternalDocumentation.class); + } + } + + private Map bindings(JsonNode node, ObjectCodec objectCodec, DeserializationContext deserializationContext) throws IOException { + if (node == null) { + return null; + } + + try (JsonParser jsonParser = node.traverse(objectCodec)) { + MessageBindingsDeserializer deserializer = new MessageBindingsDeserializer(); + + return deserializer.deserialize(jsonParser, deserializationContext); + } + } + + private List examples(JsonNode node, ObjectCodec objectCodec) throws IOException { + if (node == null) { + return null; + } + + try (JsonParser jsonParser = node.traverse(objectCodec)) { + return jsonParser.readValueAs(new TypeReference>() {}); + } + } + + private List traits(JsonNode node, ObjectCodec objectCodec, DeserializationContext deserializationContext) throws IOException { + if (node == null) { + return null; + } + + try (JsonParser jsonParser = node.traverse(objectCodec)) { + MessageTraitsDeserializer deserializer = new MessageTraitsDeserializer(); + + return deserializer.deserialize(jsonParser, deserializationContext); + } + } + + private Object payload(JsonNode messageNode, ObjectCodec objectCodec) throws IOException { + JsonNode payloadNode = messageNode.get("payload"); + if (payloadNode == null) { + return null; + } + + try (JsonParser jsonParser = payloadNode.traverse(objectCodec)) { + if (payloadNode.properties().size() == 1 && payloadNode.get("$ref") != null) { + return jsonParser.readValueAs(Reference.class); + } + + JsonNode schemaFormatNode = messageNode.findValue("schemaFormat"); + if (schemaFormatNode == null) { + return jsonParser.readValueAs(AsyncAPISchema.class); + } + + Class messageToDeserializeTo = AsyncAPISchema.class; + switch (schemaFormatNode.textValue()) { + case "application/schema+json;version=draft-07": + case "application/schema+yaml;version=draft-07": { + messageToDeserializeTo = JsonSchema.class; + break; + } + case "application/vnd.oai.openapi;version=3.0.0": + case "application/vnd.oai.openapi+json;version=3.0.0": + case "application/vnd.oai.openapi+yaml;version=3.0.0": + case "application/vnd.oai.openapi;version=3.0.1": + case "application/vnd.oai.openapi+json;version=3.0.1": + case "application/vnd.oai.openapi+yaml;version=3.0.1": + case "application/vnd.oai.openapi;version=3.0.2": + case "application/vnd.oai.openapi+json;version=3.0.2": + case "application/vnd.oai.openapi+yaml;version=3.0.2": + case "application/vnd.oai.openapi;version=3.0.3": + case "application/vnd.oai.openapi+json;version=3.0.3": + case "application/vnd.oai.openapi+yaml;version=3.0.3": { + messageToDeserializeTo = OpenAPISchema.class; + break; + } + case "application/vnd.apache.avro;version=1.9.0": + case "application/vnd.apache.avro+json;version=1.9.0": + case "application/vnd.apache.avro+yaml;version=1.9.0": + case "application/vnd.apache.avro;version=1.9.1": + case "application/vnd.apache.avro+json;version=1.9.1": + case "application/vnd.apache.avro+yaml;version=1.9.1": + case "application/vnd.apache.avro;version=1.9.2": + case "application/vnd.apache.avro+json;version=1.9.2": + case "application/vnd.apache.avro+yaml;version=1.9.2": + case "application/vnd.apache.avro;version=1.10.0": + case "application/vnd.apache.avro+json;version=1.10.0": + case "application/vnd.apache.avro+yaml;version=1.10.0": + case "application/vnd.apache.avro;version=1.10.1": + case "application/vnd.apache.avro+json;version=1.10.1": + case "application/vnd.apache.avro+yaml;version=1.10.1": + case "application/vnd.apache.avro;version=1.10.2": + case "application/vnd.apache.avro+json;version=1.10.2": + case "application/vnd.apache.avro+yaml;version=1.10.2": + case "application/vnd.apache.avro;version=1.11.0": + case "application/vnd.apache.avro+json;version=1.11.0": + case "application/vnd.apache.avro+yaml;version=1.11.0": + case "application/vnd.apache.avro;version=1.11.1": + case "application/vnd.apache.avro+json;version=1.11.1": + case "application/vnd.apache.avro+yaml;version=1.11.1": { + messageToDeserializeTo = AvroSchema.class; + break; + } + } + + return jsonParser.readValueAs(messageToDeserializeTo); + } + } + + private Object chooseKnownPojo(JsonNode jsonNode, final ObjectCodec objectCodec) throws IOException { + try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { + JsonNodeType nodeType = jsonNode.getNodeType(); + + switch (nodeType) { + case ARRAY: + return readAsList((ArrayNode) jsonNode, objectCodec); + case BOOLEAN: + return jsonNode.asBoolean(); + case NUMBER: + return jsonParser.readValueAs(Number.class); + case OBJECT: + return jsonParser.readValueAs(Object.class); + case STRING: + return jsonParser.readValueAs(String.class); + case BINARY: + case POJO: + case MISSING: + case NULL: + return null; + } + + return null; + } + } + + private List readAsList(ArrayNode arrayNode, ObjectCodec objectCodec) throws IOException { + List list = new ArrayList<>(); + for (JsonNode childNode : arrayNode) { + list.add(chooseKnownPojo(childNode, objectCodec)); + } + + return list; + } + + private Map extensionFields(JsonNode messageNode, ObjectCodec objectCodec) throws IOException { + if (messageNode == null) { + return null; + } + + Map extensionFields = new HashMap<>(); + List> unknownProperties = messageNode.properties().stream() + .filter(property -> !propertiesToIgnore.contains(property.getKey())) + .collect(Collectors.toList()); + + for (Map.Entry property: unknownProperties) { + if (ExtendableObject.extensionPropertyNamePattern.matcher(property.getKey()).matches()) { + extensionFields.put(property.getKey(), chooseKnownPojo(property.getValue(), objectCodec)); + } else { + throw new JsonMappingException(String.format("\"%s\" is not valid extension property (through reference chain: com.asyncapi.v2._6_0.model.channel.message.Message[\"%s\"])", property.getKey(), property.getKey())); + } + } + + if (extensionFields.isEmpty()) { + return null; + } + + return extensionFields; + } + + @Override + public Message deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JacksonException { + ObjectCodec objectCodec = jsonParser.getCodec(); + JsonNode messageNode = objectCodec.readTree(jsonParser); + + Message message = Message.builder() + .messageId(string(messageNode.get("messageId"), objectCodec)) + .headers(headers(messageNode.get("headers"), objectCodec, deserializationContext)) + .payload(payload(messageNode, objectCodec)) + .correlationId(correlationId(messageNode.get("correlationId"), objectCodec, deserializationContext)) + .schemaFormat(string(messageNode.get("schemaFormat"), objectCodec)) + .contentType(string(messageNode.get("contentType"), objectCodec)) + .name(string(messageNode.get("name"), objectCodec)) + .title(string(messageNode.get("title"), objectCodec)) + .summary(string(messageNode.get("summary"), objectCodec)) + .description(string(messageNode.get("description"), objectCodec)) + .tags(tags(messageNode.get("tags"), objectCodec)) + .externalDocs(externalDocs(messageNode.get("externalDocs"), objectCodec)) + .bindings(bindings(messageNode.get("bindings"), objectCodec, deserializationContext)) + .examples(examples(messageNode.get("examples"), objectCodec)) + .traits(traits(messageNode.get("traits"), objectCodec, deserializationContext)) + .build(); + + message.setExtensionFields(extensionFields(messageNode, objectCodec)); + return message; + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java index c33605d7..8552587d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -2,76 +2,22 @@ import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; +import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; /** * Serializes message traits list. * * @author Pavel Bodiachevskii */ -public class MessageHeadersDeserializer extends JsonDeserializer { +public class MessageHeadersDeserializer extends ReferenceOrObjectDeserializer { @Override - public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - ObjectCodec objectCodec = p.getCodec(); - JsonNode node = objectCodec.readTree(p); - - /* - Problem: - Both, Reference class and Schema class have $ref field. - So, this is only reason why I receive next exception: - "com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: - Unrecognized field "title" (class com.asyncapi.v2._6_0.model.Reference), - not marked as ignorable (one known property: "$ref"])" - in case when Schema contains $ref. - Solution: - Try to deserialize reference. In case of exception, try to deserialize it as given ObjectType. In case of - one more exception, throw it. - TODO: Think how to improve. - */ - try { - return chooseKnownPojo(node, objectCodec); - } catch (UnrecognizedPropertyException unrecognizedPropertyException) { - return readAsObject(node, objectCodec); - } - } - - private Object chooseKnownPojo(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - JsonNode ref = jsonNode.get("$ref"); - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - if (isMultiFormatSchema(jsonNode)) { - return jsonParser.readValueAs(MultiFormatSchema.class); - } - - if (ref != null) { - return jsonParser.readValueAs(Reference.class); - } else { - return jsonParser.readValueAs(AsyncAPISchema.class); - } - } - } - - private Object readAsObject(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - return jsonParser.readValueAs(AsyncAPISchema.class); - } + public Class objectTypeClass() { + return AsyncAPISchema.class; } - private boolean isMultiFormatSchema(@NotNull JsonNode jsonNode) { - JsonNode schemaFormat = jsonNode.get("schemaFormat"); - JsonNode schema = jsonNode.get("schema"); - - return (schemaFormat != null) && (schema != null); + public Class referenceClass() { + return Reference.class; } } diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java deleted file mode 100644 index c10a703c..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.asyncapi.v2._6_0.jackson.model.channel.message; - -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; - -/** - * Serializes message traits list. - * - * @author Pavel Bodiachevskii - */ -public class MessagePayloadDeserializer extends JsonDeserializer { - - @Override - public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - ObjectCodec objectCodec = p.getCodec(); - JsonNode node = objectCodec.readTree(p); - - /* - Problem: - Both, Reference class and Schema class have $ref field. - So, this is only reason why I receive next exception: - "com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: - Unrecognized field "title" (class com.asyncapi.v2._6_0.model.Reference), - not marked as ignorable (one known property: "$ref"])" - in case when Schema contains $ref. - Solution: - Try to deserialize reference. In case of exception, try to deserialize it as given ObjectType. In case of - one more exception, throw it. - TODO: Think how to improve. - */ - try { - return chooseKnownPojo(node, objectCodec); - } catch (UnrecognizedPropertyException unrecognizedPropertyException) { - return readAsObject(node, objectCodec); - } - } - - private Object chooseKnownPojo(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - JsonNode ref = jsonNode.get("$ref"); - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - if (isMultiFormatSchema(jsonNode)) { - return jsonParser.readValueAs(MultiFormatSchema.class); - } - - if (ref != null) { - return jsonParser.readValueAs(Reference.class); - } else { - return jsonParser.readValueAs(AsyncAPISchema.class); - } - } - } - - private Object readAsObject(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - return jsonParser.readValueAs(AsyncAPISchema.class); - } - } - - private boolean isMultiFormatSchema(@NotNull JsonNode jsonNode) { - JsonNode schemaFormat = jsonNode.get("schemaFormat"); - JsonNode schema = jsonNode.get("schema"); - - return (schemaFormat != null) && (schema != null); - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java index e779fb86..a114db83 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java @@ -1,23 +1,18 @@ package com.asyncapi.v2._6_0.model.channel.message; +import com.asyncapi.bindings.MessageBinding; +import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.JsonSchema; import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; -import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; -import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer; -import com.asyncapi.v2._6_0.jackson.model.channel.message.MessagePayloadDeserializer; -import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageTraitsDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; +import com.asyncapi.v2._6_0.jackson.model.channel.message.*; import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; -import com.asyncapi.bindings.MessageBinding; -import com.asyncapi.bindings.MessageBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -35,6 +30,7 @@ @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) +@JsonDeserialize(using = MessageDeserializer.class) public class Message extends ExtendableObject { /** @@ -54,7 +50,6 @@ public class Message extends ExtendableObject { * MUST BE: *
    *
  • {@link AsyncAPISchema}
    • - *
  • {@link MultiFormatSchema}
    • *
  • {@link Reference}
    • *
*/ @@ -70,12 +65,13 @@ public class Message extends ExtendableObject { * MUST BE: *
    *
  • {@link AsyncAPISchema}
    • - *
  • {@link MultiFormatSchema}
    • + *
  • {@link OpenAPISchema}
    • + *
  • {@link JsonSchema}
    • + *
  • {@link AvroSchema}
    • *
  • {@link Reference}
    • *
*/ @Nullable - @JsonDeserialize(using = MessagePayloadDeserializer.class) private Object payload; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java index d8d07a2c..5f20725a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java @@ -58,7 +58,6 @@ public class MessageTrait extends ExtendableObject { * MUST BE: *
    *
  • {@link AsyncAPISchema}
    • - *
  • {@link MultiFormatSchema}
    • *
  • {@link Reference}
    • *
*/ diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt index 0b70e6d8..88088989 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt @@ -92,7 +92,7 @@ class GitterStreaming: AbstractExampleValidationTest() { )) .messages(mapOf( Pair("chatMessage", Message.builder() - .schemaFormat("application/schema+yaml;version=draft-07") + .schemaFormat("application/vnd.aai.asyncapi+yaml;version=2.6.0") .summary("A message represents an individual chat message sent to a room. They are a sub-resource of a room.") .payload(AsyncAPISchema.builder() .type("object") @@ -255,7 +255,7 @@ class GitterStreaming: AbstractExampleValidationTest() { .build() ), Pair("heartbeat", Message.builder() - .schemaFormat("application/schema+yaml;version=draft-07") + .schemaFormat("application/vnd.aai.asyncapi+yaml;version=2.6.0") .summary("Its purpose is to keep the connection alive.") .payload(AsyncAPISchema.builder() .type("string") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt new file mode 100644 index 00000000..606fa95e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt @@ -0,0 +1,88 @@ +package com.asyncapi.examples.v2._6_0 + +import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.Reference +import com.asyncapi.v2._6_0.model.channel.ChannelItem +import com.asyncapi.v2._6_0.model.channel.message.Message +import com.asyncapi.v2._6_0.model.channel.operation.Operation +import com.asyncapi.v2._6_0.model.component.Components +import com.asyncapi.v2._6_0.model.info.Info +import com.asyncapi.v2._6_0.model.server.Server +import java.math.BigDecimal + +class SchemaFormatAsyncAPIPayload: AbstractExampleValidationTest() { + + override fun specificationLocation(): String = "/examples/v2.6.0/schemaFormat - asyncapi payload.yml" + + override fun expectedInfo(): Info { + return Info.builder() + .title("Kafka Queue Example") + .version("1.0.0") + .build() + } + + override fun expectedServers(): Map { + return mapOf( + Pair("activemq", Server.builder() + .url("tcp://localhost:61616") + .protocol("kafka") + .build() + ) + ) + } + + override fun expectedChannels(): Map { + return mapOf( + Pair("products", ChannelItem.builder() + .publish(Operation.builder() + .operationId("publishObjectMessage") + .message(Reference("#/components/messages/product")) + .build() + ) + .build() + ) + ) + } + + override fun expectedComponents(): Components { + return Components.builder() + .messages(mapOf( + Pair("product", Message.builder() + .name("product") + .title("An inventory product") + .summary("Product representing items in inventory") + .contentType("application/json") + .schemaFormat("application/vnd.aai.asyncapi+json;version=2.6.0") + .payload(AsyncAPISchema.builder() + .id("https://example.com/person.schema.json") + .schema("http://json-schema.org/draft-07/schema#") + .title("Person") + .type("object") + .properties(mapOf( + Pair("firstName", AsyncAPISchema.builder() + .type("string") + .description("The person's first name.") + .build() + ), + Pair("lastName", AsyncAPISchema.builder() + .type("string") + .description("The person's last name.") + .build() + ), + Pair("age", AsyncAPISchema.builder() + .type("integer") + .description("Age in years which must be equal to or greater than zero.") + .minimum(BigDecimal.ZERO) + .build() + ) + )) + .build() + ) + .build() + ) + )) + .build() + } + +} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAvroPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAvroPayload.kt new file mode 100644 index 00000000..97a6b45d --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAvroPayload.kt @@ -0,0 +1,90 @@ +package com.asyncapi.examples.v2._6_0 + +import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.avro.v1._9_0.* +import com.asyncapi.v2._6_0.model.channel.ChannelItem +import com.asyncapi.v2._6_0.model.channel.message.Message +import com.asyncapi.v2._6_0.model.channel.operation.Operation +import com.asyncapi.v2._6_0.model.component.Components +import com.asyncapi.v2._6_0.model.info.Info +import com.asyncapi.v2._6_0.model.server.Server + +class SchemaFormatAvroPayload: AbstractExampleValidationTest() { + + override fun specificationLocation(): String = "/examples/v2.6.0/schemaFormat - avro payload.yml" + + override fun expectedInfo(): Info { + return Info.builder() + .title("Kafka Queue Example") + .version("1.0.0") + .build() + } + + override fun expectedServers(): Map { + return mapOf( + Pair("activemq", Server.builder() + .url("tcp://localhost:61616") + .protocol("kafka") + .build() + ) + ) + } + + override fun expectedChannels(): Map { + return mapOf( + Pair("products", ChannelItem.builder() + .publish(Operation.builder() + .operationId("publishObjectMessage") + .message(Reference("#/components/messages/product")) + .build() + ) + .build() + ) + ) + } + + override fun expectedComponents(): Components { + return Components.builder() + .messages(mapOf( + Pair("product", Message.builder() + .name("product") + .title("An inventory product") + .summary("Product representing items in inventory") + .contentType("application/json") + .schemaFormat("application/vnd.apache.avro;version=1.11.1") + .payload(AvroSchemaRecord.builder() + .name("ApplicationEvent") + .namespace("model") + .doc("") + .fields(listOf( + AvroSchemaRecordField.builder() + .name("applicationId") + .type(AvroSchemaType.STRING) + .doc("Application ID") + .build(), + AvroSchemaRecordField.builder() + .name("status") + .type(AvroSchemaType.STRING) + .doc("Application Status") + .build(), + AvroSchemaRecordField.builder() + .name("documents") + .type( + AvroSchemaUnion( + AvroSchemaType.NULL, + AvroSchemaArray("model.DocumentInfo") + ) + ) + .doc("") + .defaultValue(null) + .build() + )) + .build() + ) + .build() + ) + )) + .build() + } + +} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt new file mode 100644 index 00000000..a57935ab --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt @@ -0,0 +1,87 @@ +package com.asyncapi.examples.v2._6_0 + +import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.Reference +import com.asyncapi.v2._6_0.model.channel.ChannelItem +import com.asyncapi.v2._6_0.model.channel.message.Message +import com.asyncapi.v2._6_0.model.channel.operation.Operation +import com.asyncapi.v2._6_0.model.component.Components +import com.asyncapi.v2._6_0.model.info.Info +import com.asyncapi.v2._6_0.model.server.Server +import java.math.BigDecimal + +class SchemaFormatJsonSchemaPayload: AbstractExampleValidationTest() { + + override fun specificationLocation(): String = "/examples/v2.6.0/schemaFormat - json schema payload.yml" + + override fun expectedInfo(): Info { + return Info.builder() + .title("Kafka Queue Example") + .version("1.0.0") + .build() + } + + override fun expectedServers(): Map { + return mapOf( + Pair("activemq", Server.builder() + .url("tcp://localhost:61616") + .protocol("kafka") + .build() + ) + ) + } + + override fun expectedChannels(): Map { + return mapOf( + Pair("products", ChannelItem.builder() + .publish(Operation.builder() + .operationId("publishObjectMessage") + .message(Reference("#/components/messages/product")) + .build() + ) + .build() + ) + ) + } + + override fun expectedComponents(): Components { + return Components.builder() + .messages(mapOf( + Pair("product", Message.builder() + .name("product") + .title("An inventory product") + .summary("Product representing items in inventory") + .contentType("application/json") + .schemaFormat("application/schema+json;version=draft-07") + .payload(JsonSchema.builder() + .id("https://example.com/person.schema.json") + .schema("http://json-schema.org/draft-07/schema#") + .title("Person") + .type("object") + .properties(mapOf( + Pair("firstName", JsonSchema.builder() + .type("string") + .description("The person's first name.") + .build() + ), + Pair("lastName", JsonSchema.builder() + .type("string") + .description("The person's last name.") + .build() + ), + Pair("age", JsonSchema.builder() + .type("integer") + .description("Age in years which must be equal to or greater than zero.") + .minimum(BigDecimal.ZERO) + .build() + ) + )) + .build() + ) + .build() + ) + )) + .build() + } + +} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatOpenAPIPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatOpenAPIPayload.kt new file mode 100644 index 00000000..041c5cdd --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatOpenAPIPayload.kt @@ -0,0 +1,84 @@ +package com.asyncapi.examples.v2._6_0 + +import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema +import com.asyncapi.v2._6_0.model.channel.ChannelItem +import com.asyncapi.v2._6_0.model.channel.message.Message +import com.asyncapi.v2._6_0.model.channel.operation.Operation +import com.asyncapi.v2._6_0.model.component.Components +import com.asyncapi.v2._6_0.model.info.Info +import com.asyncapi.v2._6_0.model.server.Server + +class SchemaFormatOpenAPIPayload: AbstractExampleValidationTest() { + + override fun specificationLocation(): String = "/examples/v2.6.0/schemaFormat - openapi payload.yml" + + override fun expectedInfo(): Info { + return Info.builder() + .title("Kafka Queue Example") + .version("1.0.0") + .build() + } + + override fun expectedServers(): Map { + return mapOf( + Pair("activemq", Server.builder() + .url("tcp://localhost:61616") + .protocol("kafka") + .build() + ) + ) + } + + override fun expectedChannels(): Map { + return mapOf( + Pair("products", ChannelItem.builder() + .publish(Operation.builder() + .operationId("publishObjectMessage") + .message(Reference("#/components/messages/product")) + .build() + ) + .build() + ) + ) + } + + override fun expectedComponents(): Components { + return Components.builder() + .messages(mapOf( + Pair("product", Message.builder() + .name("product") + .title("An inventory product") + .summary("Product representing items in inventory") + .contentType("application/json") + .schemaFormat("application/vnd.oai.openapi;version=3.0.0") + .payload(OpenAPISchema.builder() + .type("object") + .properties(mapOf( + Pair("name", OpenAPISchema.builder() + .description("Every product has a name") + .type("string") + .example("Iphone") + .build() + ), + Pair("inventory", OpenAPISchema.builder() + .description("Count of items in inventory") + .type("number") + .nullable(true) + .build() + ), + Pair("id", OpenAPISchema.builder() + .description("Unique identifier of the product") + .type("number") + .build() + ) + )) + .build() + ) + .build() + ) + )) + .build() + } + +} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAsyncAPIPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAsyncAPIPayload.kt new file mode 100644 index 00000000..f6535680 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAsyncAPIPayload.kt @@ -0,0 +1,61 @@ +package com.asyncapi.examples.v2._6_0 + +import com.asyncapi.schemas.Reference +import com.asyncapi.v2._6_0.model.channel.ChannelItem +import com.asyncapi.v2._6_0.model.channel.message.Message +import com.asyncapi.v2._6_0.model.channel.operation.Operation +import com.asyncapi.v2._6_0.model.component.Components +import com.asyncapi.v2._6_0.model.info.Info +import com.asyncapi.v2._6_0.model.server.Server + +class SchemaFormatReferenceToAsyncAPIPayload: AbstractExampleValidationTest() { + + override fun specificationLocation(): String = "/examples/v2.6.0/schemaFormat - reference to asyncapi payload.yml" + + override fun expectedInfo(): Info { + return Info.builder() + .title("Kafka Queue Example") + .version("1.0.0") + .build() + } + + override fun expectedServers(): Map { + return mapOf( + Pair("activemq", Server.builder() + .url("tcp://localhost:61616") + .protocol("kafka") + .build() + ) + ) + } + + override fun expectedChannels(): Map { + return mapOf( + Pair("products", ChannelItem.builder() + .publish(Operation.builder() + .operationId("publishObjectMessage") + .message(Reference("#/components/messages/product")) + .build() + ) + .build() + ) + ) + } + + override fun expectedComponents(): Components { + return Components.builder() + .messages(mapOf( + Pair("product", Message.builder() + .name("product") + .title("An inventory product") + .summary("Product representing items in inventory") + .contentType("application/json") + .schemaFormat("application/vnd.aai.asyncapi+json;version=2.6.0") + .payload(Reference("https://registry.local/persoon.json")) + .build() + ) + )) + .build() + } + +} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAvroPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAvroPayload.kt new file mode 100644 index 00000000..0d66720f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAvroPayload.kt @@ -0,0 +1,61 @@ +package com.asyncapi.examples.v2._6_0 + +import com.asyncapi.schemas.Reference +import com.asyncapi.v2._6_0.model.channel.ChannelItem +import com.asyncapi.v2._6_0.model.channel.message.Message +import com.asyncapi.v2._6_0.model.channel.operation.Operation +import com.asyncapi.v2._6_0.model.component.Components +import com.asyncapi.v2._6_0.model.info.Info +import com.asyncapi.v2._6_0.model.server.Server + +class SchemaFormatReferenceToAvroPayload: AbstractExampleValidationTest() { + + override fun specificationLocation(): String = "/examples/v2.6.0/schemaFormat - reference to avro payload.yml" + + override fun expectedInfo(): Info { + return Info.builder() + .title("Kafka Queue Example") + .version("1.0.0") + .build() + } + + override fun expectedServers(): Map { + return mapOf( + Pair("activemq", Server.builder() + .url("tcp://localhost:61616") + .protocol("kafka") + .build() + ) + ) + } + + override fun expectedChannels(): Map { + return mapOf( + Pair("products", ChannelItem.builder() + .publish(Operation.builder() + .operationId("publishObjectMessage") + .message(Reference("#/components/messages/product")) + .build() + ) + .build() + ) + ) + } + + override fun expectedComponents(): Components { + return Components.builder() + .messages(mapOf( + Pair("product", Message.builder() + .name("product") + .title("An inventory product") + .summary("Product representing items in inventory") + .contentType("application/json") + .schemaFormat("application/vnd.apache.avro;version=1.11.1") + .payload(Reference("https://registry.local/product.avsc")) + .build() + ) + )) + .build() + } + +} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToJsonSchemaPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToJsonSchemaPayload.kt new file mode 100644 index 00000000..6f2762e8 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToJsonSchemaPayload.kt @@ -0,0 +1,61 @@ +package com.asyncapi.examples.v2._6_0 + +import com.asyncapi.schemas.Reference +import com.asyncapi.v2._6_0.model.channel.ChannelItem +import com.asyncapi.v2._6_0.model.channel.message.Message +import com.asyncapi.v2._6_0.model.channel.operation.Operation +import com.asyncapi.v2._6_0.model.component.Components +import com.asyncapi.v2._6_0.model.info.Info +import com.asyncapi.v2._6_0.model.server.Server + +class SchemaFormatReferenceToJsonSchemaPayload: AbstractExampleValidationTest() { + + override fun specificationLocation(): String = "/examples/v2.6.0/schemaFormat - reference to json schema payload.yml" + + override fun expectedInfo(): Info { + return Info.builder() + .title("Kafka Queue Example") + .version("1.0.0") + .build() + } + + override fun expectedServers(): Map { + return mapOf( + Pair("activemq", Server.builder() + .url("tcp://localhost:61616") + .protocol("kafka") + .build() + ) + ) + } + + override fun expectedChannels(): Map { + return mapOf( + Pair("products", ChannelItem.builder() + .publish(Operation.builder() + .operationId("publishObjectMessage") + .message(Reference("#/components/messages/product")) + .build() + ) + .build() + ) + ) + } + + override fun expectedComponents(): Components { + return Components.builder() + .messages(mapOf( + Pair("product", Message.builder() + .name("product") + .title("An inventory product") + .summary("Product representing items in inventory") + .contentType("application/json") + .schemaFormat("application/schema+json;version=draft-07") + .payload(Reference("https://registry.local/persoon.json")) + .build() + ) + )) + .build() + } + +} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToOpenAPIPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToOpenAPIPayload.kt new file mode 100644 index 00000000..b6caa2c2 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToOpenAPIPayload.kt @@ -0,0 +1,63 @@ +package com.asyncapi.examples.v2._6_0 + +import com.asyncapi.schemas.Reference +import com.asyncapi.v2._6_0.model.channel.ChannelItem +import com.asyncapi.v2._6_0.model.channel.message.CorrelationId +import com.asyncapi.v2._6_0.model.channel.message.Message +import com.asyncapi.v2._6_0.model.channel.operation.Operation +import com.asyncapi.v2._6_0.model.component.Components +import com.asyncapi.v2._6_0.model.info.Info +import com.asyncapi.v2._6_0.model.server.Server + +class SchemaFormatReferenceToOpenAPIPayload: AbstractExampleValidationTest() { + + override fun specificationLocation(): String = "/examples/v2.6.0/schemaFormat - reference to openapi payload.yml" + + override fun expectedInfo(): Info { + return Info.builder() + .title("Kafka Queue Example") + .version("1.0.0") + .build() + } + + override fun expectedServers(): Map { + return mapOf( + Pair("activemq", Server.builder() + .url("tcp://localhost:61616") + .protocol("kafka") + .build() + ) + ) + } + + override fun expectedChannels(): Map { + return mapOf( + Pair("products", ChannelItem.builder() + .publish(Operation.builder() + .operationId("publishObjectMessage") + .message(Reference("#/components/messages/product")) + .build() + ) + .build() + ) + ) + } + + override fun expectedComponents(): Components { + return Components.builder() + .messages(mapOf( + Pair("product", Message.builder() + .name("product") + .title("An inventory product") + .summary("Product representing items in inventory") + .contentType("application/json") + .schemaFormat("application/vnd.oai.openapi;version=3.0.0") + .payload(Reference("https://registry.local/product.json")) + .correlationId(CorrelationId("abcd", "in headers")) + .build() + ) + )) + .build() + } + +} \ No newline at end of file diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index b0c9198a..c5913457 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -65,7 +65,7 @@ class MessageTest: SerDeTest() { .build() ) .correlationId(CorrelationId("Default Correlation ID", "\$message.header#/correlationId")) - .schemaFormat("application/vnd.apache.avro+json;version=1.9.0") + .schemaFormat("application/vnd.aai.asyncapi;version=2.6.0") .contentType("application/json") .name("UserSignup") .title("User signup") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index e734361a..0d62317a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -47,7 +47,7 @@ class MessageTraitTest: SerDeTest() { .build() ) .correlationId(CorrelationId("Default Correlation ID", "\$message.header#/correlationId")) - .schemaFormat("application/vnd.apache.avro+json;version=1.9.0") + .schemaFormat("application/vnd.aai.asyncapi;version=2.6.0") .contentType("application/json") .name("UserSignup") .title("User signup") diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/gitter-streaming.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/gitter-streaming.yml index a815a8ec..57bce912 100644 --- a/asyncapi-core/src/test/resources/examples/v2.6.0/gitter-streaming.yml +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/gitter-streaming.yml @@ -43,7 +43,7 @@ components: scheme: bearer messages: chatMessage: - schemaFormat: 'application/schema+yaml;version=draft-07' + schemaFormat: 'application/vnd.aai.asyncapi+yaml;version=2.6.0' summary: >- A message represents an individual chat message sent to a room. They are a sub-resource of a room. @@ -146,7 +146,7 @@ components: $ref: '#/components/messageBindings/streamingHeaders' heartbeat: - schemaFormat: 'application/schema+yaml;version=draft-07' + schemaFormat: 'application/vnd.aai.asyncapi+yaml;version=2.6.0' summary: Its purpose is to keep the connection alive. payload: type: string diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - asyncapi payload.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - asyncapi payload.yml new file mode 100644 index 00000000..a5e9b09c --- /dev/null +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - asyncapi payload.yml @@ -0,0 +1,38 @@ +asyncapi: 2.6.0 +info: + title: Kafka Queue Example + version: '1.0.0' +servers: + activemq: + url: tcp://localhost:61616 + protocol: kafka +channels: + products: + publish: + operationId: publishObjectMessage + message: + $ref: "#/components/messages/product" +components: + messages: + product: + name: product + title: An inventory product + summary: Product representing items in inventory + contentType: application/json + schemaFormat: application/vnd.aai.asyncapi+json;version=2.6.0 + payload: + $id: 'https://example.com/person.schema.json' + $schema: 'http://json-schema.org/draft-07/schema#' + title: Person + type: object + properties: + firstName: + type: string + description: The person's first name. + lastName: + type: string + description: The person's last name. + age: + description: Age in years which must be equal to or greater than zero. + type: integer + minimum: 0 \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - avro payload.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - avro payload.yml new file mode 100644 index 00000000..7db6a0b1 --- /dev/null +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - avro payload.yml @@ -0,0 +1,41 @@ +asyncapi: 2.6.0 +info: + title: Kafka Queue Example + version: '1.0.0' +servers: + activemq: + url: tcp://localhost:61616 + protocol: kafka +channels: + products: + publish: + operationId: publishObjectMessage + message: + $ref: "#/components/messages/product" +components: + messages: + product: + name: product + title: An inventory product + summary: Product representing items in inventory + contentType: application/json + schemaFormat: application/vnd.apache.avro;version=1.11.1 + payload: + namespace: model + type: record + doc: '' + name: ApplicationEvent + fields: + - name: applicationId + type: string + doc: Application ID + - name: status + type: string + doc: Application Status + - name: documents + type: + - 'null' + - type: array + items: model.DocumentInfo + doc: '' + default: null \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - json schema payload.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - json schema payload.yml new file mode 100644 index 00000000..61940f04 --- /dev/null +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - json schema payload.yml @@ -0,0 +1,38 @@ +asyncapi: 2.6.0 +info: + title: Kafka Queue Example + version: '1.0.0' +servers: + activemq: + url: tcp://localhost:61616 + protocol: kafka +channels: + products: + publish: + operationId: publishObjectMessage + message: + $ref: "#/components/messages/product" +components: + messages: + product: + name: product + title: An inventory product + summary: Product representing items in inventory + contentType: application/json + schemaFormat: application/schema+json;version=draft-07 + payload: + $id: 'https://example.com/person.schema.json' + $schema: 'http://json-schema.org/draft-07/schema#' + title: Person + type: object + properties: + firstName: + type: string + description: The person's first name. + lastName: + type: string + description: The person's last name. + age: + description: Age in years which must be equal to or greater than zero. + type: integer + minimum: 0 \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - openapi payload.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - openapi payload.yml new file mode 100644 index 00000000..4fbbc5cd --- /dev/null +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - openapi payload.yml @@ -0,0 +1,36 @@ +asyncapi: 2.6.0 +info: + title: Kafka Queue Example + version: '1.0.0' +servers: + activemq: + url: tcp://localhost:61616 + protocol: kafka +channels: + products: + publish: + operationId: publishObjectMessage + message: + $ref: "#/components/messages/product" +components: + messages: + product: + name: product + title: An inventory product + summary: Product representing items in inventory + contentType: application/json + schemaFormat: application/vnd.oai.openapi;version=3.0.0 + payload: + type: object + properties: + name: + description: Every product has a name + type: string + example: Iphone + inventory: + description: Count of items in inventory + type: number + nullable: true + id: + description: Unique identifier of the product + type: number \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to asyncapi payload.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to asyncapi payload.yml new file mode 100644 index 00000000..96081433 --- /dev/null +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to asyncapi payload.yml @@ -0,0 +1,24 @@ +asyncapi: 2.6.0 +info: + title: Kafka Queue Example + version: '1.0.0' +servers: + activemq: + url: tcp://localhost:61616 + protocol: kafka +channels: + products: + publish: + operationId: publishObjectMessage + message: + $ref: "#/components/messages/product" +components: + messages: + product: + name: product + title: An inventory product + summary: Product representing items in inventory + contentType: application/json + schemaFormat: application/vnd.aai.asyncapi+json;version=2.6.0 + payload: + $ref: https://registry.local/persoon.json \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to avro payload.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to avro payload.yml new file mode 100644 index 00000000..22172fd3 --- /dev/null +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to avro payload.yml @@ -0,0 +1,24 @@ +asyncapi: 2.6.0 +info: + title: Kafka Queue Example + version: '1.0.0' +servers: + activemq: + url: tcp://localhost:61616 + protocol: kafka +channels: + products: + publish: + operationId: publishObjectMessage + message: + $ref: "#/components/messages/product" +components: + messages: + product: + name: product + title: An inventory product + summary: Product representing items in inventory + contentType: application/json + schemaFormat: application/vnd.apache.avro;version=1.11.1 + payload: + $ref: https://registry.local/product.avsc \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to json schema payload.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to json schema payload.yml new file mode 100644 index 00000000..604087d5 --- /dev/null +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to json schema payload.yml @@ -0,0 +1,24 @@ +asyncapi: 2.6.0 +info: + title: Kafka Queue Example + version: '1.0.0' +servers: + activemq: + url: tcp://localhost:61616 + protocol: kafka +channels: + products: + publish: + operationId: publishObjectMessage + message: + $ref: "#/components/messages/product" +components: + messages: + product: + name: product + title: An inventory product + summary: Product representing items in inventory + contentType: application/json + schemaFormat: application/schema+json;version=draft-07 + payload: + $ref: https://registry.local/persoon.json \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to openapi payload.yml b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to openapi payload.yml new file mode 100644 index 00000000..62c3e5a6 --- /dev/null +++ b/asyncapi-core/src/test/resources/examples/v2.6.0/schemaFormat - reference to openapi payload.yml @@ -0,0 +1,27 @@ +asyncapi: 2.6.0 +info: + title: Kafka Queue Example + version: '1.0.0' +servers: + activemq: + url: tcp://localhost:61616 + protocol: kafka +channels: + products: + publish: + operationId: publishObjectMessage + message: + $ref: "#/components/messages/product" +components: + messages: + product: + name: product + title: An inventory product + summary: Product representing items in inventory + contentType: application/json + schemaFormat: application/vnd.oai.openapi;version=3.0.0 + payload: + $ref: https://registry.local/product.json + correlationId: + description: abcd + location: in headers \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 670bae98..23e24fe3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -433,7 +433,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", @@ -866,7 +866,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", @@ -1604,7 +1604,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", @@ -2037,7 +2037,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", @@ -2349,7 +2349,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", @@ -2764,7 +2764,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - wrongly extended.json index cc2a0361..eaadce55 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - wrongly extended.json @@ -470,7 +470,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -958,7 +958,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -1759,7 +1759,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -2247,7 +2247,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -2579,7 +2579,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -3021,7 +3021,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json index 85c47dd3..0d0bc009 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json @@ -468,7 +468,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -955,7 +955,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -1755,7 +1755,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -2242,7 +2242,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -2575,7 +2575,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -3017,7 +3017,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json index a4e8785a..bee38a5d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json @@ -303,7 +303,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", @@ -736,7 +736,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json index cb857fe3..574f671e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json @@ -356,7 +356,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -843,7 +843,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json index fe6406ca..af23645e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json @@ -356,7 +356,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -843,7 +843,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json index b4597976..77220e6e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json @@ -28,7 +28,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json index bcfd1430..29a319d2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json @@ -28,7 +28,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json index 52120fef..9cacd1cf 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json @@ -28,7 +28,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json index 8109f8ac..34919486 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json @@ -17,7 +17,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json index e5b458aa..efd0a26e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json @@ -17,7 +17,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json index 6bf2b6ba..5e7c0e68 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json @@ -17,7 +17,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json index d87f7c1f..aed9c246 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json @@ -33,7 +33,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json index ca2941ba..e546d5e6 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json @@ -297,7 +297,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json index 9e06c19c..8e5c60c8 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json @@ -348,7 +348,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json index 7be3b9b9..73a28287 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json @@ -346,7 +346,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json index aee00358..54c8e851 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json @@ -300,7 +300,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json index c889a632..af6bd128 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json @@ -351,7 +351,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json index aa6c6d0b..11d2f965 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json @@ -351,7 +351,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index e4880d2e..ed1750fb 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -455,7 +455,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", @@ -888,7 +888,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", @@ -1200,7 +1200,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", @@ -1615,7 +1615,7 @@ "description" : "Default Correlation ID", "location" : "$message.header#/correlationId" }, - "schemaFormat" : "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat" : "application/vnd.aai.asyncapi;version=2.6.0", "contentType" : "application/json", "name" : "UserSignup", "title" : "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json index daed3183..38d4b02d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json @@ -498,7 +498,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -986,7 +986,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -1318,7 +1318,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -1760,7 +1760,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json index 95208d23..ab41a4dc 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json @@ -496,7 +496,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -983,7 +983,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -1316,7 +1316,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", @@ -1758,7 +1758,7 @@ "description": "Default Correlation ID", "location": "$message.header#/correlationId" }, - "schemaFormat": "application/vnd.apache.avro+json;version=1.9.0", + "schemaFormat": "application/vnd.aai.asyncapi;version=2.6.0", "contentType": "application/json", "name": "UserSignup", "title": "User signup", From b0f69951d9c231ed8909b4df56d734d85a5a16e3 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 6 May 2024 02:16:49 +0400 Subject: [PATCH 084/141] feat(schemas): move OpenID security scheme --- .../security}/OpenIdConnectSecurityScheme.java | 3 ++- .../asyncapi/v3/security_scheme/SecurityScheme.java | 1 + .../asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt | 8 +++++--- .../examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 10 ++++++++-- .../security_scheme/OpenIdConnectSecuritySchemeTest.kt | 1 + 5 files changed, 17 insertions(+), 6 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/OpenIdConnectSecurityScheme.java (93%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/OpenIdConnectSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java similarity index 93% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/OpenIdConnectSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java index 2ef45095..34623a87 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/OpenIdConnectSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java @@ -1,5 +1,6 @@ -package com.asyncapi.v3.security_scheme; +package com.asyncapi.schemas.security; +import com.asyncapi.v3.security_scheme.SecurityScheme; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java index faf4614d..c5d7dc52 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java @@ -1,6 +1,7 @@ package com.asyncapi.v3.security_scheme; import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme; import com.asyncapi.v3.security_scheme.http.HttpApiKeySecurityScheme; import com.asyncapi.v3.security_scheme.http.HttpSecurityScheme; import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt index db10383c..452fcf46 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt @@ -14,7 +14,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v3.security_scheme.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows import com.asyncapi.v3.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow @@ -300,11 +300,13 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { ), null )), - Pair("openIdConnectWellKnown", OpenIdConnectSecurityScheme( + Pair("openIdConnectWellKnown", + OpenIdConnectSecurityScheme( null, "https://authserver.example/.well-known", null - )), + ) + ), )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index 0cb03557..d8117b4d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -1,7 +1,7 @@ package com.asyncapi.examples.v3._0_0 import com.asyncapi.v3.security_scheme.ApiKeySecurityScheme -import com.asyncapi.v3.security_scheme.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel @@ -363,7 +363,13 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { null ) ), - Pair("openIdConnectWellKnown", OpenIdConnectSecurityScheme(null, "https://authserver.example/.well-known", null)) + Pair("openIdConnectWellKnown", + OpenIdConnectSecurityScheme( + null, + "https://authserver.example/.well-known", + null + ) + ) )) .parameters(mapOf( Pair("streetlightId", Parameter.builder().description("The ID of the streetlight.").build()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt index baf2ff56..8b9564f1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme import com.asyncapi.v3.SerDeTest /** From ff4202ad9a0211dc3b78c69dea64a08c350c44e3 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 6 May 2024 02:17:08 +0400 Subject: [PATCH 085/141] feat(schemas): move API key security scheme --- .../security}/ApiKeySecurityScheme.java | 3 ++- .../com/asyncapi/v3/security_scheme/SecurityScheme.java | 1 + .../asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt | 9 +++++---- .../examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 7 +++++-- .../v3/security_scheme/ApiKeySecuritySchemeTest.kt | 1 + 5 files changed, 14 insertions(+), 7 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/ApiKeySecurityScheme.java (91%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/ApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/ApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java index 8b0b92bc..907e5cfd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/ApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java @@ -1,5 +1,6 @@ -package com.asyncapi.v3.security_scheme; +package com.asyncapi.schemas.security; +import com.asyncapi.v3.security_scheme.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java index c5d7dc52..ad39d852 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java @@ -1,6 +1,7 @@ package com.asyncapi.v3.security_scheme; import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.security.ApiKeySecurityScheme; import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme; import com.asyncapi.v3.security_scheme.http.HttpApiKeySecurityScheme; import com.asyncapi.v3.security_scheme.http.HttpSecurityScheme; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt index 452fcf46..2218b352 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.security_scheme.ApiKeySecurityScheme +import com.asyncapi.schemas.security.ApiKeySecurityScheme import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -254,9 +254,10 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { )) .securitySchemes(mapOf( Pair("apiKey", ApiKeySecurityScheme( - "Provide your API key as the user and leave the password empty.", - ApiKeySecurityScheme.ApiKeyLocation.USER - )), + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) + ), Pair("supportedOauthFlows", OAuth2SecurityScheme( "Flows to support OAuth 2.0", OAuthFlows( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index d8117b4d..aef3c81d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.v3.security_scheme.ApiKeySecurityScheme +import com.asyncapi.schemas.security.ApiKeySecurityScheme import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.Tag @@ -316,7 +316,10 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { )) .securitySchemes(mapOf( Pair("apiKey", - ApiKeySecurityScheme("Provide your API key as the user and leave the password empty.", ApiKeySecurityScheme.ApiKeyLocation.USER) + ApiKeySecurityScheme( + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) ), Pair("supportedOauthFlows", OAuth2SecurityScheme( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt index fc7aa22d..66c5f526 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.ApiKeySecurityScheme import com.asyncapi.v3.SerDeTest /** From fd3566ac44411614a157958765c0a61372cdc7b1 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 6 May 2024 02:19:33 +0400 Subject: [PATCH 086/141] feat(schemas): move HTTP security schemas --- .../security}/http/HttpApiKeySecurityScheme.java | 2 +- .../security}/http/HttpSecurityScheme.java | 2 +- .../asyncapi/v3/security_scheme/SecurityScheme.java | 4 ++-- .../examples/v3/_0_0/GitterStreamingAsyncAPI.kt | 8 +++++--- .../com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt | 11 ++++++----- .../http/HttpApiKeySecuritySchemeTest.kt | 1 + .../v3/security_scheme/http/HttpSecuritySchemeTest.kt | 1 + 7 files changed, 17 insertions(+), 12 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/http/HttpApiKeySecurityScheme.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/http/HttpSecurityScheme.java (96%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/http/HttpApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/http/HttpApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java index 4965be62..41ee5c83 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/http/HttpApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.security_scheme.http; +package com.asyncapi.schemas.security.http; import com.asyncapi.v3.security_scheme.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/http/HttpSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/http/HttpSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java index efb0acaf..249240a3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/http/HttpSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.security_scheme.http; +package com.asyncapi.schemas.security.http; import com.asyncapi.v3.security_scheme.SecurityScheme; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java index ad39d852..84013e98 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java @@ -3,8 +3,8 @@ import com.asyncapi.schemas.ExtendableObject; import com.asyncapi.schemas.security.ApiKeySecurityScheme; import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme; -import com.asyncapi.v3.security_scheme.http.HttpApiKeySecurityScheme; -import com.asyncapi.v3.security_scheme.http.HttpSecurityScheme; +import com.asyncapi.schemas.security.http.HttpApiKeySecurityScheme; +import com.asyncapi.schemas.security.http.HttpSecurityScheme; import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index 0c895899..e2366b43 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -15,7 +15,7 @@ import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.multiformat.JsonFormatSchema -import com.asyncapi.v3.security_scheme.http.HttpSecurityScheme +import com.asyncapi.schemas.security.http.HttpSecurityScheme class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { @@ -98,11 +98,13 @@ class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { override fun expectedComponents(): Components? { return Components.builder() .securitySchemes(mapOf( - Pair("httpBearerToken", HttpSecurityScheme( + Pair("httpBearerToken", + HttpSecurityScheme( null, "bearer", null, - )) + ) + ) )) .messages(mapOf( Pair("chatMessage", Message.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt index 44b58f02..8d53f4ec 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt @@ -9,7 +9,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v3.security_scheme.http.HttpApiKeySecurityScheme +import com.asyncapi.schemas.security.http.HttpApiKeySecurityScheme class SlackRtmAsyncAPI: AbstractExampleValidationTest() { @@ -265,10 +265,11 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { return Components.builder() .securitySchemes(mapOf( Pair("token", HttpApiKeySecurityScheme( - null, - "token", - HttpApiKeySecurityScheme.ApiKeyLocation.QUERY - )) + null, + "token", + HttpApiKeySecurityScheme.ApiKeyLocation.QUERY + ) + ) )) .schemas(mapOf( Pair("attachment", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpApiKeySecuritySchemeTest.kt index df47744d..14900858 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpApiKeySecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.http +import com.asyncapi.schemas.security.http.HttpApiKeySecurityScheme import com.asyncapi.v3.SerDeTest class HttpApiKeySecuritySchemeTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpSecuritySchemeTest.kt index c06ad616..bb7d7752 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.http +import com.asyncapi.schemas.security.http.HttpSecurityScheme import com.asyncapi.v3.SerDeTest class HttpSecuritySchemeBasicTest: SerDeTest() { From 195f588b43d6bf12f1e10a9674a42f7e29f4ee88 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 6 May 2024 02:21:31 +0400 Subject: [PATCH 087/141] feat(schemas): move OAuth2 security schemas --- .../oauth2/OAuth2SecurityScheme.java | 2 +- .../security}/oauth2/OAuthFlows.java | 10 +- .../flow/AuthorizationCodeOAuthFlow.java | 2 +- .../flow/ClientCredentialsOAuthFlow.java | 2 +- .../oauth2/flow/ImplicitOAuthFlow.java | 2 +- .../security}/oauth2/flow/OAuthFlow.java | 2 +- .../oauth2/flow/PasswordOAuthFlow.java | 2 +- .../v3/security_scheme/SecurityScheme.java | 2 +- .../examples/v3/_0_0/CorrelationIdAsyncAPI.kt | 164 ++++++++++++------ .../v3/_0_0/OperationSecurityAsyncAPI.kt | 66 +++---- .../v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 92 +++++++--- .../StreetlightsOperationSecurityAsyncAPI.kt | 98 +++++------ .../oauth2/OAuth2SecuritySchemeTest.kt | 1 + .../security_scheme/oauth2/OAuthFlowTest.kt | 1 + .../flow/AuthorizationCodeOAuthFlowTest.kt | 1 + .../flow/ClientCredentialsOAuthFlowTest.kt | 1 + .../oauth2/flow/ImplicitOAuthFlowTest.kt | 1 + .../oauth2/flow/OAuthFlowTest.kt | 1 + .../oauth2/flow/PasswordOAuthFlowTest.kt | 1 + 19 files changed, 282 insertions(+), 169 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/oauth2/OAuth2SecurityScheme.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/oauth2/OAuthFlows.java (78%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/oauth2/flow/AuthorizationCodeOAuthFlow.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/oauth2/flow/ClientCredentialsOAuthFlow.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/oauth2/flow/ImplicitOAuthFlow.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/oauth2/flow/OAuthFlow.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/oauth2/flow/PasswordOAuthFlow.java (95%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java index 0e3d6224..04cbc641 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.security_scheme.oauth2; +package com.asyncapi.schemas.security.oauth2; import com.asyncapi.v3.security_scheme.SecurityScheme; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuthFlows.java similarity index 78% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuthFlows.java index e2bf0db2..0a38eb9a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuthFlows.java @@ -1,10 +1,10 @@ -package com.asyncapi.v3.security_scheme.oauth2; +package com.asyncapi.schemas.security.oauth2; import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.v3.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow; -import com.asyncapi.v3.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow; -import com.asyncapi.v3.security_scheme.oauth2.flow.ImplicitOAuthFlow; -import com.asyncapi.v3.security_scheme.oauth2.flow.PasswordOAuthFlow; +import com.asyncapi.schemas.security.oauth2.flow.AuthorizationCodeOAuthFlow; +import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow; +import com.asyncapi.schemas.security.oauth2.flow.ImplicitOAuthFlow; +import com.asyncapi.schemas.security.oauth2.flow.PasswordOAuthFlow; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/AuthorizationCodeOAuthFlow.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/AuthorizationCodeOAuthFlow.java index d16786b8..744f24bd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/AuthorizationCodeOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ClientCredentialsOAuthFlow.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ClientCredentialsOAuthFlow.java index 5995a99a..6b80d2b1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ImplicitOAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ImplicitOAuthFlow.java index dd7a4348..ab76601a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ImplicitOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/OAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/OAuthFlow.java index 7d975634..d44c2fde 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/OAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/PasswordOAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/PasswordOAuthFlow.java index 979c9297..097a90c3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/PasswordOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java index 84013e98..a63313ea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java @@ -5,7 +5,7 @@ import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme; import com.asyncapi.schemas.security.http.HttpApiKeySecurityScheme; import com.asyncapi.schemas.security.http.HttpSecurityScheme; -import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme; +import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt index 2218b352..8f9c0091 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt @@ -15,12 +15,12 @@ import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme -import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v3.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.v3.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.v3.security_scheme.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.v3.security_scheme.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.oauth2.OAuthFlows +import com.asyncapi.schemas.security.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.security.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { @@ -63,36 +63,72 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { ImplicitOAuthFlow( "", mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + Pair( + "streetlights:on", + "Ability to switch lights on" + ), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair( + "streetlights:dim", + "Ability to dim the lights" + ), ), "https://authserver.example/auth" ), PasswordOAuthFlow( "", mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + Pair( + "streetlights:on", + "Ability to switch lights on" + ), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair( + "streetlights:dim", + "Ability to dim the lights" + ), ), "https://authserver.example/token" ), ClientCredentialsOAuthFlow( "", mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + Pair( + "streetlights:on", + "Ability to switch lights on" + ), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair( + "streetlights:dim", + "Ability to dim the lights" + ), ), "https://authserver.example/token" ), AuthorizationCodeOAuthFlow( "https://authserver.example/refresh", mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + Pair( + "streetlights:on", + "Ability to switch lights on" + ), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair( + "streetlights:dim", + "Ability to dim the lights" + ), ), "https://authserver.example/auth", "https://authserver.example/token" @@ -258,49 +294,63 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { ApiKeySecurityScheme.ApiKeyLocation.USER ) ), - Pair("supportedOauthFlows", OAuth2SecurityScheme( - "Flows to support OAuth 2.0", - OAuthFlows( - ImplicitOAuthFlow( - "", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + Pair("supportedOauthFlows", + OAuth2SecurityScheme( + "Flows to support OAuth 2.0", + OAuthFlows( + ImplicitOAuthFlow( + "", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/auth" ), - "https://authserver.example/auth" - ), - PasswordOAuthFlow( - "", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + PasswordOAuthFlow( + "", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/token" ), - "https://authserver.example/token" - ), - ClientCredentialsOAuthFlow( - "", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/token" ), - "https://authserver.example/token" + AuthorizationCodeOAuthFlow( + "https://authserver.example/refresh", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/auth", + "https://authserver.example/token" + ) ), - AuthorizationCodeOAuthFlow( - "https://authserver.example/refresh", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), - ), - "https://authserver.example/auth", - "https://authserver.example/token" - ) - ), - null - )), + null + ) + ), Pair("openIdConnectWellKnown", OpenIdConnectSecurityScheme( null, diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt index a45c1446..339b7eac 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt @@ -10,9 +10,9 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v3.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.oauth2.OAuthFlows +import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { @@ -50,22 +50,25 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.SEND) .channel(Reference("#/channels/authRevoke")) .security(listOf( - OAuth2SecurityScheme( - "The oauth security descriptions", - OAuthFlows( - null, - null, - ClientCredentialsOAuthFlow( - "", - mapOf( - Pair("subscribe:auth_revocations", "Scope required for authorization revocation topic") - ), - "https://example.com/api/oauth/dialog" - ), - null + OAuth2SecurityScheme( + "The oauth security descriptions", + OAuthFlows( + null, + null, + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair( + "subscribe:auth_revocations", + "Scope required for authorization revocation topic" + ) ), - listOf("subscribe:auth_revocations"), - ) + "https://example.com/api/oauth/dialog" + ), + null + ), + listOf("subscribe:auth_revocations"), + ) )) .bindings(mapOf( Pair("http", HTTPOperationBinding.builder() @@ -210,22 +213,27 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { ) )) .securitySchemes(mapOf( - Pair("petstore_auth", OAuth2SecurityScheme( + Pair("petstore_auth", + OAuth2SecurityScheme( "The oauth security descriptions", OAuthFlows( - null, - null, - ClientCredentialsOAuthFlow( - "", - mapOf( - Pair("subscribe:auth_revocations", "Scope required for authorization revocation topic") - ), - "https://example.com/api/oauth/dialog" + null, + null, + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair( + "subscribe:auth_revocations", + "Scope required for authorization revocation topic" + ) ), - null + "https://example.com/api/oauth/dialog" + ), + null ), null - )) + ) + ) )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index aef3c81d..c465ccb5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -18,12 +18,12 @@ import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v3.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.v3.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.v3.security_scheme.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.v3.security_scheme.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.oauth2.OAuthFlows +import com.asyncapi.schemas.security.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.security.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { @@ -73,36 +73,72 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { ImplicitOAuthFlow( "", mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights") + Pair( + "streetlights:on", + "Ability to switch lights on" + ), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair( + "streetlights:dim", + "Ability to dim the lights" + ) ), "https://authserver.example/auth" ), PasswordOAuthFlow( "", mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights") + Pair( + "streetlights:on", + "Ability to switch lights on" + ), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair( + "streetlights:dim", + "Ability to dim the lights" + ) ), "https://authserver.example/token" ), ClientCredentialsOAuthFlow( "", mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights") + Pair( + "streetlights:on", + "Ability to switch lights on" + ), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair( + "streetlights:dim", + "Ability to dim the lights" + ) ), "https://authserver.example/token" ), AuthorizationCodeOAuthFlow( "https://authserver.example/refresh", mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights") + Pair( + "streetlights:on", + "Ability to switch lights on" + ), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair( + "streetlights:dim", + "Ability to dim the lights" + ) ), "https://authserver.example/auth", "https://authserver.example/token" @@ -329,7 +365,10 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { "", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/auth" @@ -338,7 +377,10 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { "", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/token" @@ -347,7 +389,10 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { "", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/token" @@ -356,7 +401,10 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { "https://authserver.example/refresh", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/auth", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt index e8a75e89..9262783a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt @@ -15,9 +15,9 @@ import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.v3.security_scheme.SecurityScheme -import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v3.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v3.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.oauth2.OAuthFlows +import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow import java.math.BigDecimal class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { @@ -57,23 +57,23 @@ class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { .protocol("kafka-secure") .description("Test port for oauth") .security(listOf( - OAuth2SecurityScheme( - "The oauth security descriptions", - OAuthFlows( - null, - null, - ClientCredentialsOAuthFlow( - "", - mapOf( - Pair("streetlights:read", "Scope required for subscribing to channel"), - Pair("streetlights:write", "Scope required for publishing to channel") - ), - "https://example.com/api/oauth/dialog" - ), - null + OAuth2SecurityScheme( + "The oauth security descriptions", + OAuthFlows( + null, + null, + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair("streetlights:read", "Scope required for subscribing to channel"), + Pair("streetlights:write", "Scope required for publishing to channel") ), - listOf("streetlights:write", "streetlights:read") - ) + "https://example.com/api/oauth/dialog" + ), + null + ), + listOf("streetlights:write", "streetlights:read") + ) )) .build() ) @@ -136,21 +136,21 @@ class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { override fun expectedOperations(): Map { val oAuth2SecurityScheme = OAuth2SecurityScheme( - "The oauth security descriptions", - OAuthFlows( - null, - null, - ClientCredentialsOAuthFlow( - "", - mapOf( - Pair("streetlights:read", "Scope required for subscribing to channel"), - Pair("streetlights:write", "Scope required for publishing to channel") - ), - "https://example.com/api/oauth/dialog" - ), - null + "The oauth security descriptions", + OAuthFlows( + null, + null, + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair("streetlights:read", "Scope required for subscribing to channel"), + Pair("streetlights:write", "Scope required for publishing to channel") + ), + "https://example.com/api/oauth/dialog" ), - listOf("streetlights:read") + null + ), + listOf("streetlights:read") ) return mapOf( @@ -295,23 +295,23 @@ class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { .build() ), Pair("streetlights_auth", - OAuth2SecurityScheme( - "The oauth security descriptions", - OAuthFlows( - null, - null, - ClientCredentialsOAuthFlow( - "", - mapOf( - Pair("streetlights:read", "Scope required for subscribing to channel"), - Pair("streetlights:write", "Scope required for publishing to channel") - ), - "https://example.com/api/oauth/dialog" - ), - null + OAuth2SecurityScheme( + "The oauth security descriptions", + OAuthFlows( + null, + null, + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair("streetlights:read", "Scope required for subscribing to channel"), + Pair("streetlights:write", "Scope required for publishing to channel") ), - null - ) + "https://example.com/api/oauth/dialog" + ), + null + ), + null + ) ) )) .parameters(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt index 19d6840c..afbac964 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2 +import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.security_scheme.SecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuthFlowTest.kt index 1a943fa8..3f099a34 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2 +import com.asyncapi.schemas.security.oauth2.OAuthFlows import com.asyncapi.v3.SerDeTest import com.asyncapi.v3.security_scheme.oauth2.flow.* diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt index 7979a95a..517e0849 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow +import com.asyncapi.schemas.security.oauth2.flow.AuthorizationCodeOAuthFlow import com.asyncapi.v3.SerDeTest class AuthorizationCodeOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt index b8b00716..3b00e077 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow +import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow import com.asyncapi.v3.SerDeTest class ClientCredentialsOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt index 12cdc5df..fdc228bd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow +import com.asyncapi.schemas.security.oauth2.flow.ImplicitOAuthFlow import com.asyncapi.v3.SerDeTest class ImplicitOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlowTest.kt index f46d4666..2e3ef65d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow +import com.asyncapi.schemas.security.oauth2.flow.OAuthFlow import com.asyncapi.v3.SerDeTest class OAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt index 531e97ad..3c40572c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme.oauth2.flow +import com.asyncapi.schemas.security.oauth2.flow.PasswordOAuthFlow import com.asyncapi.v3.SerDeTest class PasswordOAuthFlowTest: SerDeTest() { From 2f58f6216b5df90b6f44e442a144066f6a085e84 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 6 May 2024 02:21:57 +0400 Subject: [PATCH 088/141] feat(schemas): move security schemas --- .../schemas/security/ApiKeySecurityScheme.java | 1 - .../schemas/security/OpenIdConnectSecurityScheme.java | 1 - .../security}/SecurityScheme.java | 4 +--- .../security/http/HttpApiKeySecurityScheme.java | 2 +- .../schemas/security/http/HttpSecurityScheme.java | 2 +- .../schemas/security/oauth2/OAuth2SecurityScheme.java | 2 +- .../ComponentsSecuritySchemesDeserializer.java | 2 +- .../asyncapi/v3/_0_0/model/component/Components.java | 2 +- .../asyncapi/v3/_0_0/model/operation/Operation.java | 2 +- .../v3/_0_0/model/operation/OperationTrait.java | 2 +- .../java/com/asyncapi/v3/_0_0/model/server/Server.java | 2 +- .../security_scheme/SecuritySchemesDeserializer.java | 2 +- .../examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt | 10 +++++----- .../examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt | 10 +++++----- .../v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt | 2 +- .../v3/security_scheme/ApiKeySecuritySchemeTest.kt | 1 + .../AsymmetricEncryptionSecuritySchemeTest.kt | 1 + .../v3/security_scheme/GssapiSecuritySchemeTest.kt | 1 + .../security_scheme/OpenIdConnectSecuritySchemeTest.kt | 1 + .../v3/security_scheme/PlainSecuritySchemeTest.kt | 1 + .../security_scheme/ScramSha256SecuritySchemeTest.kt | 1 + .../security_scheme/ScramSha512SecuritySchemeTest.kt | 1 + .../SymmetricEncryptionSecuritySchemeTest.kt | 1 + .../security_scheme/UserPasswordSecuritySchemeTest.kt | 1 + .../v3/security_scheme/X509SecuritySchemeTest.kt | 1 + .../security_scheme/oauth2/OAuth2SecuritySchemeTest.kt | 2 +- 26 files changed, 32 insertions(+), 26 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/security_scheme => schemas/security}/SecurityScheme.java (96%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java index 907e5cfd..a73c839e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java @@ -1,6 +1,5 @@ package com.asyncapi.schemas.security; -import com.asyncapi.v3.security_scheme.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java index 34623a87..99803a39 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java @@ -1,6 +1,5 @@ package com.asyncapi.schemas.security; -import com.asyncapi.v3.security_scheme.SecurityScheme; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/SecurityScheme.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/SecurityScheme.java index a63313ea..58dcf150 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/SecurityScheme.java @@ -1,8 +1,6 @@ -package com.asyncapi.v3.security_scheme; +package com.asyncapi.schemas.security; import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.security.ApiKeySecurityScheme; -import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme; import com.asyncapi.schemas.security.http.HttpApiKeySecurityScheme; import com.asyncapi.schemas.security.http.HttpSecurityScheme; import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java index 41ee5c83..55bed76c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.security.http; -import com.asyncapi.v3.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java index 249240a3..a904d2a4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.security.http; -import com.asyncapi.v3.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.SecurityScheme; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java index 04cbc641..6e35cefa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.security.oauth2; -import com.asyncapi.v3.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.SecurityScheme; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index 56e75020..d2e1e993 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; -import com.asyncapi.v3.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.SecurityScheme; public class ComponentsSecuritySchemesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index 31d36775..bd0cf51a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -25,7 +25,7 @@ import com.asyncapi.bindings.ServerBindingsDeserializer; import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.v3.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.SecurityScheme; import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java index 44bb5e3a..06d2283e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java @@ -12,7 +12,7 @@ import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; -import com.asyncapi.v3.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java index c0a27bc3..bb0e95e1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java @@ -9,7 +9,7 @@ import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; -import com.asyncapi.v3.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java index 2c36ceaa..c0faaa98 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; -import com.asyncapi.v3.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java index 2ab2ee4a..7c063940 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; -import com.asyncapi.v3.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.SecurityScheme; /** * Deserializes security schemes. diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt index 13aef6a5..e36c99b4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt @@ -21,7 +21,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.multiformat.AvroFormatSchema -import com.asyncapi.v3.security_scheme.SecurityScheme +import com.asyncapi.schemas.security.SecurityScheme class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { @@ -216,10 +216,10 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { override fun expectedComponents(): Components? { val saslSslSecurityScheme = SecurityScheme( - SecurityScheme.Type.PLAIN, - "Use [SASL authentication with SSL " + - "encryption](https://docs.confluent.io/platform/current/security/security_tutorial.html#configure-clients) " + - "to connect to the ADEO Broker." + SecurityScheme.Type.PLAIN, + "Use [SASL authentication with SSL " + + "encryption](https://docs.confluent.io/platform/current/security/security_tutorial.html#configure-clients) " + + "to connect to the ADEO Broker." ) saslSslSecurityScheme.extensionFields = mapOf( Pair("x-sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required " + diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt index c3cf4ea1..6b7b3480 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt @@ -15,7 +15,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v3.security_scheme.SecurityScheme +import com.asyncapi.schemas.security.SecurityScheme import java.math.BigDecimal class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { @@ -279,10 +279,10 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { .build() ), Pair("certs", - SecurityScheme( - SecurityScheme.Type.X509, - "Download the certificate files from service provider" - ) + SecurityScheme( + SecurityScheme.Type.X509, + "Download the certificate files from service provider" + ) ) )) .parameters(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt index 9262783a..38d49f69 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt @@ -14,7 +14,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v3.security_scheme.SecurityScheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme import com.asyncapi.schemas.security.oauth2.OAuthFlows import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt index 66c5f526..1c0a70dd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.security_scheme import com.asyncapi.schemas.security.ApiKeySecurityScheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt index ff6e6cd1..111ac02b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/GssapiSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/GssapiSecuritySchemeTest.kt index f0f20f3c..b1f78d13 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/GssapiSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/GssapiSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt index 8b9564f1..ad304429 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt @@ -1,6 +1,7 @@ package com.asyncapi.v3.security_scheme import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/PlainSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/PlainSecuritySchemeTest.kt index 9eca4fd4..8b791585 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/PlainSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/PlainSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha256SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha256SecuritySchemeTest.kt index 501f23f3..a9a829ed 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha256SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha256SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha512SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha512SecuritySchemeTest.kt index 1e26e677..234c4a0f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha512SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha512SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt index 4f6057da..bfa590bd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/UserPasswordSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/UserPasswordSecuritySchemeTest.kt index c7aa3980..65d3a0bb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/UserPasswordSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/UserPasswordSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/X509SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/X509SecuritySchemeTest.kt index 849ce42a..a22fdf79 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/X509SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/X509SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.v3.security_scheme +import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt index afbac964..65243401 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v3.security_scheme.oauth2 import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.security_scheme.SecurityScheme +import com.asyncapi.schemas.security.SecurityScheme /** * @author Pavel Bodiachevskii From 39edf0b269f79749168a04f20ee5c51c104aea4e Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 8 May 2024 01:47:31 +0400 Subject: [PATCH 089/141] feat(schemas): move v3 security schemas --- .../{ => v3}/ApiKeySecurityScheme.java | 2 +- .../{ => v3}/OpenIdConnectSecurityScheme.java | 2 +- .../security/{ => v3}/SecurityScheme.java | 8 ++--- .../http/HttpApiKeySecurityScheme.java | 4 +-- .../{ => v3}/http/HttpSecurityScheme.java | 4 +-- .../{ => v3}/oauth2/OAuth2SecurityScheme.java | 4 +-- .../security/{ => v3}/oauth2/OAuthFlows.java | 10 +++--- .../flow/AuthorizationCodeOAuthFlow.java | 2 +- .../flow/ClientCredentialsOAuthFlow.java | 2 +- .../oauth2/flow/ImplicitOAuthFlow.java | 2 +- .../{ => v3}/oauth2/flow/OAuthFlow.java | 2 +- .../oauth2/flow/PasswordOAuthFlow.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- .../v3/_0_0/model/component/Components.java | 2 +- .../v3/_0_0/model/operation/Operation.java | 2 +- .../_0_0/model/operation/OperationTrait.java | 2 +- .../asyncapi/v3/_0_0/model/server/Server.java | 2 +- .../SecuritySchemesDeserializer.java | 2 +- .../v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt | 2 +- .../examples/v3/_0_0/CorrelationIdAsyncAPI.kt | 16 +++++----- .../v3/_0_0/GitterStreamingAsyncAPI.kt | 2 +- .../v3/_0_0/OperationSecurityAsyncAPI.kt | 6 ++-- .../examples/v3/_0_0/SlackRtmAsyncAPI.kt | 2 +- .../v3/_0_0/StreetlightsKafkaAsyncAPI.kt | 2 +- .../v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 16 +++++----- .../StreetlightsOperationSecurityAsyncAPI.kt | 8 ++--- .../security/v3}/ApiKeySecuritySchemeTest.kt | 10 +++--- .../AsymmetricEncryptionSecuritySchemeTest.kt | 9 +++--- .../security/v3}/GssapiSecuritySchemeTest.kt | 9 +++--- .../v3}/OpenIdConnectSecuritySchemeTest.kt | 10 +++--- .../security/v3}/PlainSecuritySchemeTest.kt | 9 +++--- .../v3}/ScramSha256SecuritySchemeTest.kt | 9 +++--- .../v3}/ScramSha512SecuritySchemeTest.kt | 9 +++--- .../SymmetricEncryptionSecuritySchemeTest.kt | 9 +++--- .../v3}/UserPasswordSecuritySchemeTest.kt | 9 +++--- .../security/v3}/X509SecuritySchemeTest.kt | 9 +++--- .../v3}/http/HttpApiKeySecuritySchemeTest.kt | 9 +++--- .../v3}/http/HttpSecuritySchemeTest.kt | 15 +++++---- .../v3}/oauth2/OAuth2SecuritySchemeTest.kt | 11 +++---- .../security/v3/oauth2/OAuthFlowTest.kt | 31 +++++++++++++++++++ .../flow/AuthorizationCodeOAuthFlowTest.kt | 9 +++--- .../flow/ClientCredentialsOAuthFlowTest.kt | 9 +++--- .../v3}/oauth2/flow/ImplicitOAuthFlowTest.kt | 9 +++--- .../security/v3}/oauth2/flow/OAuthFlowTest.kt | 9 +++--- .../v3}/oauth2/flow/PasswordOAuthFlowTest.kt | 9 +++--- .../v3/_0_0/model/component/ComponentsTest.kt | 12 +++---- .../v3/_0_0/model/operation/OperationTest.kt | 2 +- .../model/operation/OperationTraitTest.kt | 2 +- .../v3/_0_0/model/server/ServerTest.kt | 4 +-- .../security_scheme/oauth2/OAuthFlowTest.kt | 29 ----------------- .../security/v3}/X509 - extended.json | 0 .../security/v3}/X509 - wrongly extended.json | 0 .../security/v3}/X509.json | 0 .../security/v3}/apiKey - extended.json | 0 .../v3}/apiKey - wrongly extended.json | 0 .../security/v3}/apiKey.json | 0 .../v3}/asymmetricEncryption - extended.json | 0 ...ymmetricEncryption - wrongly extended.json | 0 .../security/v3}/asymmetricEncryption.json | 0 .../security/v3}/gssapi - extended.json | 0 .../v3}/gssapi - wrongly extended.json | 0 .../security/v3}/gssapi.json | 0 .../v3}/http/httpApiKey - extended.json | 0 .../http/httpApiKey - wrongly extended.json | 0 .../security/v3}/http/httpApiKey.json | 0 .../v3}/http/httpBasic - extended.json | 0 .../http/httpBasic - wrongly extended.json | 0 .../security/v3}/http/httpBasic.json | 0 .../v3}/http/httpBearer - extended.json | 0 .../http/httpBearer - wrongly extended.json | 0 .../security/v3}/http/httpBearer.json | 0 ...authorizationCodeOAuthFlow - extended.json | 0 ...ationCodeOAuthFlow - wrongly extended.json | 0 .../flow/authorizationCodeOAuthFlow.json | 0 ...clientCredentialsOAuthFlow - extended.json | 0 ...edentialsOAuthFlow - wrongly extended.json | 0 .../flow/clientCredentialsOAuthFlow.json | 0 .../flow/implicitOAuthFlow - extended.json | 0 .../implicitOAuthFlow - wrongly extended.json | 0 .../v3}/oauth2/flow/implicitOAuthFlow.json | 0 .../v3}/oauth2/flow/oauthFlow - extended.json | 0 .../flow/oauthFlow - wrongly extended.json | 0 .../security/v3}/oauth2/flow/oauthFlow.json | 0 .../flow/passwordOAuthFlow - extended.json | 0 .../passwordOAuthFlow - wrongly extended.json | 0 .../v3}/oauth2/flow/passwordOAuthFlow.json | 0 .../v3}/oauth2/oauth2 - extended.json | 0 .../v3}/oauth2/oauth2 - wrongly extended.json | 0 .../security/v3}/oauth2/oauth2.json | 0 .../v3}/oauth2/oauthFlows - extended.json | 0 .../oauth2/oauthFlows - wrongly extended.json | 0 .../security/v3}/oauth2/oauthFlows.json | 0 .../v3}/openIdConnect - extended.json | 0 .../v3}/openIdConnect - wrongly extended.json | 0 .../security/v3}/openIdConnect.json | 0 .../security/v3}/plain - extended.json | 0 .../v3}/plain - wrongly extended.json | 0 .../security/v3}/plain.json | 0 .../security/v3}/scramSha256 - extended.json | 0 .../v3}/scramSha256 - wrongly extended.json | 0 .../security/v3}/scramSha256.json | 0 .../security/v3}/scramSha512 - extended.json | 0 .../v3}/scramSha512 - wrongly extended.json | 0 .../security/v3}/scramSha512.json | 0 .../v3}/symmetricEncryption - extended.json | 0 ...ymmetricEncryption - wrongly extended.json | 0 .../security/v3}/symmetricEncryption.json | 0 .../security/v3}/userPassword - extended.json | 0 .../v3}/userPassword - wrongly extended.json | 0 .../security/v3}/userPassword.json | 0 110 files changed, 172 insertions(+), 190 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/ApiKeySecurityScheme.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/OpenIdConnectSecurityScheme.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/SecurityScheme.java (94%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/http/HttpApiKeySecurityScheme.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/http/HttpSecurityScheme.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/oauth2/OAuth2SecurityScheme.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/oauth2/OAuthFlows.java (77%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/oauth2/flow/AuthorizationCodeOAuthFlow.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/oauth2/flow/ClientCredentialsOAuthFlow.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/oauth2/flow/ImplicitOAuthFlow.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/oauth2/flow/OAuthFlow.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/security/{ => v3}/oauth2/flow/PasswordOAuthFlow.java (95%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/ApiKeySecuritySchemeTest.kt (51%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/AsymmetricEncryptionSecuritySchemeTest.kt (52%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/GssapiSecuritySchemeTest.kt (52%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/OpenIdConnectSecuritySchemeTest.kt (55%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/PlainSecuritySchemeTest.kt (52%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/ScramSha256SecuritySchemeTest.kt (52%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/ScramSha512SecuritySchemeTest.kt (52%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/SymmetricEncryptionSecuritySchemeTest.kt (52%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/UserPasswordSecuritySchemeTest.kt (52%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/X509SecuritySchemeTest.kt (52%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/http/HttpApiKeySecuritySchemeTest.kt (53%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/http/HttpSecuritySchemeTest.kt (51%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/oauth2/OAuth2SecuritySchemeTest.kt (51%) create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuthFlowTest.kt rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt (60%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/oauth2/flow/ClientCredentialsOAuthFlowTest.kt (57%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/oauth2/flow/ImplicitOAuthFlowTest.kt (57%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/oauth2/flow/OAuthFlowTest.kt (54%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v3/security_scheme => schemas/security/v3}/oauth2/flow/PasswordOAuthFlowTest.kt (57%) delete mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuthFlowTest.kt rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/X509 - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/X509 - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/X509.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/apiKey - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/apiKey - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/apiKey.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/asymmetricEncryption - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/asymmetricEncryption - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/asymmetricEncryption.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/gssapi - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/gssapi - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/gssapi.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/http/httpApiKey - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/http/httpApiKey - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/http/httpApiKey.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/http/httpBasic - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/http/httpBasic - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/http/httpBasic.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/http/httpBearer - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/http/httpBearer - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/http/httpBearer.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/authorizationCodeOAuthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/authorizationCodeOAuthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/clientCredentialsOAuthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/clientCredentialsOAuthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/implicitOAuthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/implicitOAuthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/implicitOAuthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/oauthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/oauthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/oauthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/passwordOAuthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/passwordOAuthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/flow/passwordOAuthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/oauth2 - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/oauth2 - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/oauth2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/oauthFlows - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/oauthFlows - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/oauth2/oauthFlows.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/openIdConnect - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/openIdConnect - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/openIdConnect.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/plain - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/plain - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/plain.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/scramSha256 - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/scramSha256 - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/scramSha256.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/scramSha512 - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/scramSha512 - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/scramSha512.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/symmetricEncryption - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/symmetricEncryption - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/symmetricEncryption.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/userPassword - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/userPassword - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v3/security_scheme => schemas/security/v3}/userPassword.json (100%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/ApiKeySecurityScheme.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/ApiKeySecurityScheme.java index a73c839e..caa8ad40 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/ApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/ApiKeySecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security; +package com.asyncapi.schemas.security.v3; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/OpenIdConnectSecurityScheme.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/OpenIdConnectSecurityScheme.java index 99803a39..f5db79e3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/OpenIdConnectSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/OpenIdConnectSecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security; +package com.asyncapi.schemas.security.v3; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/SecurityScheme.java similarity index 94% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/SecurityScheme.java index 58dcf150..37d4fafa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/SecurityScheme.java @@ -1,9 +1,9 @@ -package com.asyncapi.schemas.security; +package com.asyncapi.schemas.security.v3; import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.security.http.HttpApiKeySecurityScheme; -import com.asyncapi.schemas.security.http.HttpSecurityScheme; -import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme; +import com.asyncapi.schemas.security.v3.http.HttpApiKeySecurityScheme; +import com.asyncapi.schemas.security.v3.http.HttpSecurityScheme; +import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpApiKeySecurityScheme.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpApiKeySecurityScheme.java index 55bed76c..1ca9456d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpApiKeySecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.http; +package com.asyncapi.schemas.security.v3.http; -import com.asyncapi.schemas.security.SecurityScheme; +import com.asyncapi.schemas.security.v3.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpSecurityScheme.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpSecurityScheme.java index a904d2a4..a5830273 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/http/HttpSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpSecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.http; +package com.asyncapi.schemas.security.v3.http; -import com.asyncapi.schemas.security.SecurityScheme; +import com.asyncapi.schemas.security.v3.SecurityScheme; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecurityScheme.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecurityScheme.java index 6e35cefa..f52e1c83 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuth2SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.oauth2; +package com.asyncapi.schemas.security.v3.oauth2; -import com.asyncapi.schemas.security.SecurityScheme; +import com.asyncapi.schemas.security.v3.SecurityScheme; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuthFlows.java similarity index 77% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuthFlows.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuthFlows.java index 0a38eb9a..a19c1a9e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuthFlows.java @@ -1,10 +1,10 @@ -package com.asyncapi.schemas.security.oauth2; +package com.asyncapi.schemas.security.v3.oauth2; import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.security.oauth2.flow.AuthorizationCodeOAuthFlow; -import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow; -import com.asyncapi.schemas.security.oauth2.flow.ImplicitOAuthFlow; -import com.asyncapi.schemas.security.oauth2.flow.PasswordOAuthFlow; +import com.asyncapi.schemas.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow; +import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow; +import com.asyncapi.schemas.security.v3.oauth2.flow.ImplicitOAuthFlow; +import com.asyncapi.schemas.security.v3.oauth2.flow.PasswordOAuthFlow; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/AuthorizationCodeOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/AuthorizationCodeOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java index 744f24bd..b2fce862 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/AuthorizationCodeOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.oauth2.flow; +package com.asyncapi.schemas.security.v3.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ClientCredentialsOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java index 6b80d2b1..d1abfb9f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.oauth2.flow; +package com.asyncapi.schemas.security.v3.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ImplicitOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlow.java index ab76601a..264580c9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.oauth2.flow; +package com.asyncapi.schemas.security.v3.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/OAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlow.java index d44c2fde..50be75e2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.oauth2.flow; +package com.asyncapi.schemas.security.v3.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/PasswordOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlow.java index 097a90c3..d221e234 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.oauth2.flow; +package com.asyncapi.schemas.security.v3.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index d2e1e993..7e3776da 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; -import com.asyncapi.schemas.security.SecurityScheme; +import com.asyncapi.schemas.security.v3.SecurityScheme; public class ComponentsSecuritySchemesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index bd0cf51a..a3209237 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -25,7 +25,7 @@ import com.asyncapi.bindings.ServerBindingsDeserializer; import com.asyncapi.schemas.multiformat.MultiFormatSchema; import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.security.SecurityScheme; +import com.asyncapi.schemas.security.v3.SecurityScheme; import com.asyncapi.schemas.ExtendableObject; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java index 06d2283e..70c18d3c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java @@ -12,7 +12,7 @@ import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; -import com.asyncapi.schemas.security.SecurityScheme; +import com.asyncapi.schemas.security.v3.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java index bb0e95e1..be814522 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java @@ -9,7 +9,7 @@ import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; -import com.asyncapi.schemas.security.SecurityScheme; +import com.asyncapi.schemas.security.v3.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java index c0faaa98..d9bd36a0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; -import com.asyncapi.schemas.security.SecurityScheme; +import com.asyncapi.schemas.security.v3.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java index 7c063940..ffb1d1d4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; -import com.asyncapi.schemas.security.SecurityScheme; +import com.asyncapi.schemas.security.v3.SecurityScheme; /** * Deserializes security schemes. diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt index e36c99b4..411e9c00 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt @@ -21,7 +21,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.multiformat.AvroFormatSchema -import com.asyncapi.schemas.security.SecurityScheme +import com.asyncapi.schemas.security.v3.SecurityScheme class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt index 8f9c0091..df99b327 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.security.ApiKeySecurityScheme +import com.asyncapi.schemas.security.v3.ApiKeySecurityScheme import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -14,13 +14,13 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme -import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.oauth2.OAuthFlows -import com.asyncapi.schemas.security.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.security.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.schemas.security.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.security.v3.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v3.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v3.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.security.v3.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index e2366b43..101c25ca 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -15,7 +15,7 @@ import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.multiformat.JsonFormatSchema -import com.asyncapi.schemas.security.http.HttpSecurityScheme +import com.asyncapi.schemas.security.v3.http.HttpSecurityScheme class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt index 339b7eac..9271b7bc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt @@ -10,9 +10,9 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.oauth2.OAuthFlows -import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v3.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt index 8d53f4ec..755ae1cf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt @@ -9,7 +9,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.http.HttpApiKeySecurityScheme +import com.asyncapi.schemas.security.v3.http.HttpApiKeySecurityScheme class SlackRtmAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt index 6b7b3480..1acbaeb1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt @@ -15,7 +15,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.SecurityScheme +import com.asyncapi.schemas.security.v3.SecurityScheme import java.math.BigDecimal class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index c465ccb5..aaffec73 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -1,7 +1,7 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.security.ApiKeySecurityScheme -import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.security.v3.ApiKeySecurityScheme +import com.asyncapi.schemas.security.v3.OpenIdConnectSecurityScheme import com.asyncapi.schemas.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel @@ -18,12 +18,12 @@ import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.oauth2.OAuthFlows -import com.asyncapi.schemas.security.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.security.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.schemas.security.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v3.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v3.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.security.v3.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt index 38d49f69..fe93b9cf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt @@ -14,10 +14,10 @@ import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.SecurityScheme -import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.oauth2.OAuthFlows -import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v3.SecurityScheme +import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v3.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow import java.math.BigDecimal class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ApiKeySecuritySchemeTest.kt similarity index 51% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ApiKeySecuritySchemeTest.kt index 1c0a70dd..0c3fae6a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ApiKeySecuritySchemeTest.kt @@ -1,7 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.ApiKeySecurityScheme -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -11,11 +9,11 @@ class ApiKeySecuritySchemeTest: SerDeTest() { override fun objectClass() = ApiKeySecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/apiKey.json" + override fun baseObjectJson() = "/schemas/security/v3/apiKey.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/apiKey - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/apiKey - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/apiKey - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/apiKey - wrongly extended.json" override fun build(): SecurityScheme { return ApiKeySecurityScheme.apiKeyBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/AsymmetricEncryptionSecuritySchemeTest.kt similarity index 52% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/AsymmetricEncryptionSecuritySchemeTest.kt index 111ac02b..65538564 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/AsymmetricEncryptionSecuritySchemeTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -10,11 +9,11 @@ class AsymmetricEncryptionSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/asymmetricEncryption.json" + override fun baseObjectJson() = "/schemas/security/v3/asymmetricEncryption.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/asymmetricEncryption - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/asymmetricEncryption - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/asymmetricEncryption - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/asymmetricEncryption - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/GssapiSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/GssapiSecuritySchemeTest.kt similarity index 52% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/GssapiSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/GssapiSecuritySchemeTest.kt index b1f78d13..d7df0d9e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/GssapiSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/GssapiSecuritySchemeTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -10,11 +9,11 @@ class GssapiSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/gssapi.json" + override fun baseObjectJson() = "/schemas/security/v3/gssapi.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/gssapi - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/gssapi - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/gssapi - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/gssapi - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/OpenIdConnectSecuritySchemeTest.kt similarity index 55% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/OpenIdConnectSecuritySchemeTest.kt index ad304429..fccdaf9e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/OpenIdConnectSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/OpenIdConnectSecuritySchemeTest.kt @@ -1,7 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.OpenIdConnectSecurityScheme -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -11,11 +9,11 @@ class OpenIdConnectSecuritySchemeTest: SerDeTest() override fun objectClass() = OpenIdConnectSecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/openIdConnect.json" + override fun baseObjectJson() = "/schemas/security/v3/openIdConnect.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/openIdConnect - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/openIdConnect - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/openIdConnect - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/openIdConnect - wrongly extended.json" override fun build(): SecurityScheme { return OpenIdConnectSecurityScheme.openIdBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/PlainSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/PlainSecuritySchemeTest.kt similarity index 52% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/PlainSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/PlainSecuritySchemeTest.kt index 8b791585..a0b121a0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/PlainSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/PlainSecuritySchemeTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -10,11 +9,11 @@ class PlainSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/plain.json" + override fun baseObjectJson() = "/schemas/security/v3/plain.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/plain - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/plain - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/plain - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/plain - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha256SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha256SecuritySchemeTest.kt similarity index 52% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha256SecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha256SecuritySchemeTest.kt index a9a829ed..393c2f4e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha256SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha256SecuritySchemeTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -10,11 +9,11 @@ class ScramSha256SecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/scramSha256.json" + override fun baseObjectJson() = "/schemas/security/v3/scramSha256.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/scramSha256 - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/scramSha256 - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/scramSha256 - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/scramSha256 - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha512SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha512SecuritySchemeTest.kt similarity index 52% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha512SecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha512SecuritySchemeTest.kt index 234c4a0f..8af7a75d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/ScramSha512SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha512SecuritySchemeTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -10,11 +9,11 @@ class ScramSha512SecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/scramSha512.json" + override fun baseObjectJson() = "/schemas/security/v3/scramSha512.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/scramSha512 - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/scramSha512 - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/scramSha512 - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/scramSha512 - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/SymmetricEncryptionSecuritySchemeTest.kt similarity index 52% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/SymmetricEncryptionSecuritySchemeTest.kt index bfa590bd..9f0f56e1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/SymmetricEncryptionSecuritySchemeTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -10,11 +9,11 @@ class SymmetricEncryptionSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/symmetricEncryption.json" + override fun baseObjectJson() = "/schemas/security/v3/symmetricEncryption.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/symmetricEncryption - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/symmetricEncryption - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/symmetricEncryption - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/symmetricEncryption - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/UserPasswordSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/UserPasswordSecuritySchemeTest.kt similarity index 52% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/UserPasswordSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/UserPasswordSecuritySchemeTest.kt index 65d3a0bb..8be9e3b1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/UserPasswordSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/UserPasswordSecuritySchemeTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -10,11 +9,11 @@ class UserPasswordSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/userPassword.json" + override fun baseObjectJson() = "/schemas/security/v3/userPassword.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/userPassword - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/userPassword - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/userPassword - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/userPassword - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/X509SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/X509SecuritySchemeTest.kt similarity index 52% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/X509SecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/X509SecuritySchemeTest.kt index a22fdf79..88734de3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/X509SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/X509SecuritySchemeTest.kt @@ -1,6 +1,5 @@ -package com.asyncapi.v3.security_scheme +package com.asyncapi.schemas.security.v3 -import com.asyncapi.schemas.security.SecurityScheme import com.asyncapi.v3.SerDeTest /** @@ -10,11 +9,11 @@ class X509SecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/X509.json" + override fun baseObjectJson() = "/schemas/security/v3/X509.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/X509 - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/X509 - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/X509 - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/X509 - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpApiKeySecuritySchemeTest.kt similarity index 53% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpApiKeySecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpApiKeySecuritySchemeTest.kt index 14900858..14a3fa55 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpApiKeySecuritySchemeTest.kt @@ -1,17 +1,16 @@ -package com.asyncapi.v3.security_scheme.http +package com.asyncapi.schemas.security.v3.http -import com.asyncapi.schemas.security.http.HttpApiKeySecurityScheme import com.asyncapi.v3.SerDeTest class HttpApiKeySecuritySchemeTest: SerDeTest() { override fun objectClass() = HttpApiKeySecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/http/httpApiKey.json" + override fun baseObjectJson() = "/schemas/security/v3/http/httpApiKey.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/http/httpApiKey - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/http/httpApiKey - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/http/httpApiKey - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/http/httpApiKey - wrongly extended.json" override fun build(): HttpApiKeySecurityScheme { return HttpApiKeySecurityScheme.httpApiKeyBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpSecuritySchemeTest.kt similarity index 51% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpSecuritySchemeTest.kt index bb7d7752..7c355fe4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/http/HttpSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpSecuritySchemeTest.kt @@ -1,17 +1,16 @@ -package com.asyncapi.v3.security_scheme.http +package com.asyncapi.schemas.security.v3.http -import com.asyncapi.schemas.security.http.HttpSecurityScheme import com.asyncapi.v3.SerDeTest class HttpSecuritySchemeBasicTest: SerDeTest() { override fun objectClass() = HttpSecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/http/httpBasic.json" + override fun baseObjectJson() = "/schemas/security/v3/http/httpBasic.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/http/httpBasic - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/http/httpBasic - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/http/httpBasic - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/http/httpBasic - wrongly extended.json" override fun build(): HttpSecurityScheme { return HttpSecurityScheme.httpBuilder() @@ -26,11 +25,11 @@ class HttpSecuritySchemeBearerTest: SerDeTest() { override fun objectClass() = HttpSecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/http/httpBearer.json" + override fun baseObjectJson() = "/schemas/security/v3/http/httpBearer.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/http/httpBearer - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/http/httpBearer - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/http/httpBearer - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/http/httpBearer - wrongly extended.json" override fun build(): HttpSecurityScheme { return HttpSecurityScheme.httpBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecuritySchemeTest.kt similarity index 51% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecuritySchemeTest.kt index 65243401..9d924a6f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecuritySchemeTest.kt @@ -1,8 +1,7 @@ -package com.asyncapi.v3.security_scheme.oauth2 +package com.asyncapi.schemas.security.v3.oauth2 -import com.asyncapi.schemas.security.oauth2.OAuth2SecurityScheme import com.asyncapi.v3.SerDeTest -import com.asyncapi.schemas.security.SecurityScheme +import com.asyncapi.schemas.security.v3.SecurityScheme /** * @author Pavel Bodiachevskii @@ -11,11 +10,11 @@ class OAuth2SecuritySchemeTest: SerDeTest() { override fun objectClass() = OAuth2SecurityScheme::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/oauth2/oauth2.json" + override fun baseObjectJson() = "/schemas/security/v3/oauth2/oauth2.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/oauth2/oauth2 - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/oauth2/oauth2 - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/oauth2/oauth2 - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/oauth2/oauth2 - wrongly extended.json" override fun build(): SecurityScheme { return OAuth2SecurityScheme.oauth2Builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuthFlowTest.kt new file mode 100644 index 00000000..565a074a --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuthFlowTest.kt @@ -0,0 +1,31 @@ +package com.asyncapi.schemas.security.v3.oauth2 + +import com.asyncapi.schemas.security.v3.oauth2.flow.AuthorizationCodeOAuthFlowTest +import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlowTest +import com.asyncapi.schemas.security.v3.oauth2.flow.ImplicitOAuthFlowTest +import com.asyncapi.schemas.security.v3.oauth2.flow.PasswordOAuthFlowTest +import com.asyncapi.v3.SerDeTest + +/** + * @author Pavel Bodiachevskii + */ +class OAuthFlowTest: SerDeTest() { + + override fun objectClass() = OAuthFlows::class.java + + override fun baseObjectJson() = "/schemas/security/v3/oauth2/oauthFlows.json" + + override fun extendedObjectJson() = "/schemas/security/v3/oauth2/oauthFlows - extended.json" + + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/oauth2/oauthFlows - wrongly extended.json" + + override fun build(): OAuthFlows { + return OAuthFlows.builder() + .authorizationCode(AuthorizationCodeOAuthFlowTest().build()) + .clientCredentials(ClientCredentialsOAuthFlowTest().build()) + .implicit(ImplicitOAuthFlowTest().build()) + .password(PasswordOAuthFlowTest().build()) + .build() + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt similarity index 60% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt index 517e0849..89e8dbaf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt @@ -1,17 +1,16 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v3.oauth2.flow -import com.asyncapi.schemas.security.oauth2.flow.AuthorizationCodeOAuthFlow import com.asyncapi.v3.SerDeTest class AuthorizationCodeOAuthFlowTest: SerDeTest() { override fun objectClass() = AuthorizationCodeOAuthFlow::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/oauth2/flow/authorizationCodeOAuthFlow.json" + override fun baseObjectJson() = "/schemas/security/v3/oauth2/flow/authorizationCodeOAuthFlow.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/oauth2/flow/authorizationCodeOAuthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json" override fun build(): AuthorizationCodeOAuthFlow { return AuthorizationCodeOAuthFlow.authorizationCodeBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlowTest.kt similarity index 57% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlowTest.kt index 3b00e077..3081ba7e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlowTest.kt @@ -1,17 +1,16 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v3.oauth2.flow -import com.asyncapi.schemas.security.oauth2.flow.ClientCredentialsOAuthFlow import com.asyncapi.v3.SerDeTest class ClientCredentialsOAuthFlowTest: SerDeTest() { override fun objectClass() = ClientCredentialsOAuthFlow::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/oauth2/flow/clientCredentialsOAuthFlow.json" + override fun baseObjectJson() = "/schemas/security/v3/oauth2/flow/clientCredentialsOAuthFlow.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/oauth2/flow/clientCredentialsOAuthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json" override fun build(): ClientCredentialsOAuthFlow { return ClientCredentialsOAuthFlow.clientCredentialsBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlowTest.kt similarity index 57% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlowTest.kt index fdc228bd..7c5bbb62 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlowTest.kt @@ -1,17 +1,16 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v3.oauth2.flow -import com.asyncapi.schemas.security.oauth2.flow.ImplicitOAuthFlow import com.asyncapi.v3.SerDeTest class ImplicitOAuthFlowTest: SerDeTest() { override fun objectClass() = ImplicitOAuthFlow::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/oauth2/flow/implicitOAuthFlow.json" + override fun baseObjectJson() = "/schemas/security/v3/oauth2/flow/implicitOAuthFlow.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/implicitOAuthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/oauth2/flow/implicitOAuthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/implicitOAuthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/oauth2/flow/implicitOAuthFlow - wrongly extended.json" override fun build(): ImplicitOAuthFlow { return ImplicitOAuthFlow.implicitBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlowTest.kt similarity index 54% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlowTest.kt index 2e3ef65d..5784c69e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/OAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlowTest.kt @@ -1,17 +1,16 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v3.oauth2.flow -import com.asyncapi.schemas.security.oauth2.flow.OAuthFlow import com.asyncapi.v3.SerDeTest class OAuthFlowTest: SerDeTest() { override fun objectClass() = OAuthFlow::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/oauth2/flow/oauthFlow.json" + override fun baseObjectJson() = "/schemas/security/v3/oauth2/flow/oauthFlow.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/oauthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/oauth2/flow/oauthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/oauthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/oauth2/flow/oauthFlow - wrongly extended.json" override fun build(): OAuthFlow { return OAuthFlow.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlowTest.kt similarity index 57% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlowTest.kt index 3c40572c..f60df823 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlowTest.kt @@ -1,17 +1,16 @@ -package com.asyncapi.v3.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v3.oauth2.flow -import com.asyncapi.schemas.security.oauth2.flow.PasswordOAuthFlow import com.asyncapi.v3.SerDeTest class PasswordOAuthFlowTest: SerDeTest() { override fun objectClass() = PasswordOAuthFlow::class.java - override fun baseObjectJson() = "/json/v3/security_scheme/oauth2/flow/passwordOAuthFlow.json" + override fun baseObjectJson() = "/schemas/security/v3/oauth2/flow/passwordOAuthFlow.json" - override fun extendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/passwordOAuthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v3/oauth2/flow/passwordOAuthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/oauth2/flow/passwordOAuthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v3/oauth2/flow/passwordOAuthFlow - wrongly extended.json" override fun build(): PasswordOAuthFlow { return PasswordOAuthFlow.passwordBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt index 6e437f5a..6c5a9591 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt @@ -22,12 +22,12 @@ import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.Type import com.asyncapi.schemas.multiformat.JsonFormatSchema -import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest -import com.asyncapi.v3.security_scheme.OpenIdConnectSecuritySchemeTest -import com.asyncapi.v3.security_scheme.http.HttpApiKeySecuritySchemeTest -import com.asyncapi.v3.security_scheme.http.HttpSecuritySchemeBasicTest -import com.asyncapi.v3.security_scheme.http.HttpSecuritySchemeBearerTest -import com.asyncapi.v3.security_scheme.oauth2.OAuth2SecuritySchemeTest +import com.asyncapi.schemas.security.v3.ApiKeySecuritySchemeTest +import com.asyncapi.schemas.security.v3.OpenIdConnectSecuritySchemeTest +import com.asyncapi.schemas.security.v3.http.HttpApiKeySecuritySchemeTest +import com.asyncapi.schemas.security.v3.http.HttpSecuritySchemeBasicTest +import com.asyncapi.schemas.security.v3.http.HttpSecuritySchemeBearerTest +import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecuritySchemeTest /** * @version 3.0-.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 83213813..613bbbcf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyTest -import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest +import com.asyncapi.schemas.security.v3.ApiKeySecuritySchemeTest /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index e6db2cab..c9abdd87 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.schemas.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag -import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest +import com.asyncapi.schemas.security.v3.ApiKeySecuritySchemeTest /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index d0acea5e..0aa1d1da 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -23,8 +23,8 @@ import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding -import com.asyncapi.v3.security_scheme.ApiKeySecuritySchemeTest -import com.asyncapi.v3.security_scheme.http.HttpSecuritySchemeBearerTest +import com.asyncapi.schemas.security.v3.ApiKeySecuritySchemeTest +import com.asyncapi.schemas.security.v3.http.HttpSecuritySchemeBearerTest /** * @version 3.0.0 diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuthFlowTest.kt deleted file mode 100644 index 3f099a34..00000000 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/security_scheme/oauth2/OAuthFlowTest.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.asyncapi.v3.security_scheme.oauth2 - -import com.asyncapi.schemas.security.oauth2.OAuthFlows -import com.asyncapi.v3.SerDeTest -import com.asyncapi.v3.security_scheme.oauth2.flow.* - -/** - * @author Pavel Bodiachevskii - */ -class OAuthFlowTest: SerDeTest() { - - override fun objectClass() = OAuthFlows::class.java - - override fun baseObjectJson() = "/json/v3/security_scheme/oauth2/oauthFlows.json" - - override fun extendedObjectJson() = "/json/v3/security_scheme/oauth2/oauthFlows - extended.json" - - override fun wronglyExtendedObjectJson() = "/json/v3/security_scheme/oauth2/oauthFlows - wrongly extended.json" - - override fun build(): OAuthFlows { - return OAuthFlows.builder() - .authorizationCode(AuthorizationCodeOAuthFlowTest().build()) - .clientCredentials(ClientCredentialsOAuthFlowTest().build()) - .implicit(ImplicitOAuthFlowTest().build()) - .password(PasswordOAuthFlowTest().build()) - .build() - } - -} diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/X509 - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/X509 - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/X509 - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/X509 - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/X509 - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/X509 - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/X509 - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/X509 - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/X509.json b/asyncapi-core/src/test/resources/schemas/security/v3/X509.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/X509.json rename to asyncapi-core/src/test/resources/schemas/security/v3/X509.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/apiKey - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/apiKey - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/apiKey - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/apiKey - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/apiKey - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/apiKey - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/apiKey - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/apiKey - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/apiKey.json b/asyncapi-core/src/test/resources/schemas/security/v3/apiKey.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/apiKey.json rename to asyncapi-core/src/test/resources/schemas/security/v3/apiKey.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/asymmetricEncryption - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/asymmetricEncryption - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/asymmetricEncryption - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/asymmetricEncryption - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/asymmetricEncryption - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/asymmetricEncryption - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/asymmetricEncryption - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/asymmetricEncryption - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/asymmetricEncryption.json b/asyncapi-core/src/test/resources/schemas/security/v3/asymmetricEncryption.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/asymmetricEncryption.json rename to asyncapi-core/src/test/resources/schemas/security/v3/asymmetricEncryption.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/gssapi - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/gssapi - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/gssapi - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/gssapi - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/gssapi - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/gssapi - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/gssapi - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/gssapi - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/gssapi.json b/asyncapi-core/src/test/resources/schemas/security/v3/gssapi.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/gssapi.json rename to asyncapi-core/src/test/resources/schemas/security/v3/gssapi.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpApiKey - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/http/httpApiKey - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpApiKey - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/http/httpApiKey - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpApiKey - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/http/httpApiKey - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpApiKey - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/http/httpApiKey - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpApiKey.json b/asyncapi-core/src/test/resources/schemas/security/v3/http/httpApiKey.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpApiKey.json rename to asyncapi-core/src/test/resources/schemas/security/v3/http/httpApiKey.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBasic - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/http/httpBasic - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBasic - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/http/httpBasic - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBasic - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/http/httpBasic - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBasic - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/http/httpBasic - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBasic.json b/asyncapi-core/src/test/resources/schemas/security/v3/http/httpBasic.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBasic.json rename to asyncapi-core/src/test/resources/schemas/security/v3/http/httpBasic.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBearer - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/http/httpBearer - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBearer - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/http/httpBearer - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBearer - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/http/httpBearer - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBearer - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/http/httpBearer - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBearer.json b/asyncapi-core/src/test/resources/schemas/security/v3/http/httpBearer.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/http/httpBearer.json rename to asyncapi-core/src/test/resources/schemas/security/v3/http/httpBearer.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/authorizationCodeOAuthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/authorizationCodeOAuthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/authorizationCodeOAuthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/authorizationCodeOAuthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/authorizationCodeOAuthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/authorizationCodeOAuthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/clientCredentialsOAuthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/clientCredentialsOAuthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/clientCredentialsOAuthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/clientCredentialsOAuthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/clientCredentialsOAuthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/clientCredentialsOAuthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/implicitOAuthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/implicitOAuthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/implicitOAuthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/implicitOAuthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/implicitOAuthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/implicitOAuthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/implicitOAuthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/implicitOAuthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/implicitOAuthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/implicitOAuthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/implicitOAuthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/implicitOAuthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/oauthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/oauthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/oauthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/oauthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/oauthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/oauthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/oauthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/oauthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/oauthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/oauthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/oauthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/oauthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/passwordOAuthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/passwordOAuthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/passwordOAuthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/passwordOAuthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/passwordOAuthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/passwordOAuthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/passwordOAuthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/passwordOAuthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/passwordOAuthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/passwordOAuthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/flow/passwordOAuthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/flow/passwordOAuthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauth2 - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauth2 - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauth2 - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauth2 - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauth2 - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauth2 - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauth2 - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauth2 - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauth2.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauth2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauth2.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauth2.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauthFlows - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauthFlows - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauthFlows - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauthFlows - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauthFlows - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauthFlows - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauthFlows - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauthFlows - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauthFlows.json b/asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauthFlows.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/oauth2/oauthFlows.json rename to asyncapi-core/src/test/resources/schemas/security/v3/oauth2/oauthFlows.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/openIdConnect - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/openIdConnect - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/openIdConnect - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/openIdConnect - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/openIdConnect - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/openIdConnect - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/openIdConnect - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/openIdConnect - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/openIdConnect.json b/asyncapi-core/src/test/resources/schemas/security/v3/openIdConnect.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/openIdConnect.json rename to asyncapi-core/src/test/resources/schemas/security/v3/openIdConnect.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/plain - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/plain - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/plain - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/plain - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/plain - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/plain - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/plain - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/plain - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/plain.json b/asyncapi-core/src/test/resources/schemas/security/v3/plain.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/plain.json rename to asyncapi-core/src/test/resources/schemas/security/v3/plain.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha256 - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/scramSha256 - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha256 - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/scramSha256 - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha256 - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/scramSha256 - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha256 - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/scramSha256 - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha256.json b/asyncapi-core/src/test/resources/schemas/security/v3/scramSha256.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha256.json rename to asyncapi-core/src/test/resources/schemas/security/v3/scramSha256.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha512 - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/scramSha512 - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha512 - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/scramSha512 - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha512 - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/scramSha512 - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha512 - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/scramSha512 - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha512.json b/asyncapi-core/src/test/resources/schemas/security/v3/scramSha512.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/scramSha512.json rename to asyncapi-core/src/test/resources/schemas/security/v3/scramSha512.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/symmetricEncryption - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/symmetricEncryption - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/symmetricEncryption - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/symmetricEncryption - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/symmetricEncryption - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/symmetricEncryption - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/symmetricEncryption - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/symmetricEncryption - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/symmetricEncryption.json b/asyncapi-core/src/test/resources/schemas/security/v3/symmetricEncryption.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/symmetricEncryption.json rename to asyncapi-core/src/test/resources/schemas/security/v3/symmetricEncryption.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/userPassword - extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/userPassword - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/userPassword - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/userPassword - extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/userPassword - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v3/userPassword - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/userPassword - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v3/userPassword - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v3/security_scheme/userPassword.json b/asyncapi-core/src/test/resources/schemas/security/v3/userPassword.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/security_scheme/userPassword.json rename to asyncapi-core/src/test/resources/schemas/security/v3/userPassword.json From 3a1948ccda0277768b1ae3c4f0ca466559816949 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 8 May 2024 02:06:57 +0400 Subject: [PATCH 090/141] feat(schemas): move v2 security schemas --- .../security/v2}/ApiKeySecurityScheme.java | 2 +- .../v2}/OpenIdConnectSecurityScheme.java | 2 +- .../security/v2}/SecurityScheme.java | 8 +- .../v2}/http/HttpApiKeySecurityScheme.java | 4 +- .../security/v2}/http/HttpSecurityScheme.java | 4 +- .../v2}/oauth2/OAuth2SecurityScheme.java | 4 +- .../security/v2}/oauth2/OAuthFlows.java | 10 +- .../flow/AuthorizationCodeOAuthFlow.java | 2 +- .../flow/ClientCredentialsOAuthFlow.java | 2 +- .../v2}/oauth2/flow/ImplicitOAuthFlow.java | 2 +- .../security/v2}/oauth2/flow/OAuthFlow.java | 2 +- .../v2}/oauth2/flow/PasswordOAuthFlow.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- .../v2/_0_0/model/component/Components.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- .../v2/_6_0/model/component/Components.java | 2 +- .../examples/v2/_0_0/CorrelationId.kt | 117 ++++++++++-------- .../examples/v2/_0_0/GitterStreaming.kt | 8 +- .../examples/v2/_0_0/OperationSecurity.kt | 31 +++-- .../com/asyncapi/examples/v2/_0_0/SlackRtm.kt | 11 +- .../examples/v2/_0_0/StreetlightsKafka.kt | 10 +- .../examples/v2/_0_0/StreetlightsMQTT.kt | 48 ++++--- .../v2/_0_0/StreetlightsOperationSecurity.kt | 18 ++- .../examples/v2/_6_0/CorrelationId.kt | 117 ++++++++++-------- .../examples/v2/_6_0/GitterStreaming.kt | 8 +- .../examples/v2/_6_0/OperationSecurity.kt | 31 +++-- .../com/asyncapi/examples/v2/_6_0/SlackRtm.kt | 11 +- .../examples/v2/_6_0/StreetlightsKafka.kt | 10 +- .../examples/v2/_6_0/StreetlightsMQTT.kt | 48 ++++--- .../v2/_6_0/StreetlightsOperationSecurity.kt | 18 ++- .../security/v2}/ApiKeySecuritySchemeTest.kt | 8 +- .../AsymmetricEncryptionSecuritySchemeTest.kt | 8 +- .../security/v2}/GssapiSecuritySchemeTest.kt | 8 +- .../v2}/OpenIdConnectSecuritySchemeTest.kt | 8 +- .../security/v2}/PlainSecuritySchemeTest.kt | 8 +- .../v2}/ScramSha256SecuritySchemeTest.kt | 8 +- .../v2}/ScramSha512SecuritySchemeTest.kt | 8 +- .../SymmetricEncryptionSecuritySchemeTest.kt | 8 +- .../v2}/UserPasswordSecuritySchemeTest.kt | 8 +- .../security/v2}/X509SecuritySchemeTest.kt | 8 +- .../v2}/http/HttpApiKeySecuritySchemeTest.kt | 8 +- .../v2}/http/HttpSecuritySchemeTest.kt | 14 +-- .../v2}/oauth2/OAuth2SecuritySchemeTest.kt | 10 +- .../security/v2}/oauth2/OAuthFlowTest.kt | 10 +- .../flow/AuthorizationCodeOAuthFlowTest.kt | 8 +- .../flow/ClientCredentialsOAuthFlowTest.kt | 8 +- .../v2}/oauth2/flow/ImplicitOAuthFlowTest.kt | 8 +- .../security/v2}/oauth2/flow/OAuthFlowTest.kt | 8 +- .../v2}/oauth2/flow/PasswordOAuthFlowTest.kt | 8 +- .../v2/_0_0/model/component/ComponentsTest.kt | 12 +- .../v2/_6_0/model/component/ComponentsTest.kt | 12 +- .../security/v2}/X509 - extended.json | 0 .../security/v2}/X509 - wrongly extended.json | 0 .../security/v2}/X509.json | 0 .../security/v2}/apiKey - extended.json | 0 .../v2}/apiKey - wrongly extended.json | 0 .../security/v2}/apiKey.json | 0 .../v2}/asymmetricEncryption - extended.json | 0 ...ymmetricEncryption - wrongly extended.json | 0 .../security/v2}/asymmetricEncryption.json | 0 .../security/v2}/gssapi - extended.json | 0 .../v2}/gssapi - wrongly extended.json | 0 .../security/v2}/gssapi.json | 0 .../v2}/http/httpApiKey - extended.json | 0 .../http/httpApiKey - wrongly extended.json | 0 .../security/v2}/http/httpApiKey.json | 0 .../v2}/http/httpBasic - extended.json | 0 .../http/httpBasic - wrongly extended.json | 0 .../security/v2}/http/httpBasic.json | 0 .../v2}/http/httpBearer - extended.json | 0 .../http/httpBearer - wrongly extended.json | 0 .../security/v2}/http/httpBearer.json | 0 ...authorizationCodeOAuthFlow - extended.json | 0 ...ationCodeOAuthFlow - wrongly extended.json | 0 .../flow/authorizationCodeOAuthFlow.json | 0 ...clientCredentialsOAuthFlow - extended.json | 0 ...edentialsOAuthFlow - wrongly extended.json | 0 .../flow/clientCredentialsOAuthFlow.json | 0 .../flow/implicitOAuthFlow - extended.json | 0 .../implicitOAuthFlow - wrongly extended.json | 0 .../v2}/oauth2/flow/implicitOAuthFlow.json | 0 .../v2}/oauth2/flow/oauthFlow - extended.json | 0 .../flow/oauthFlow - wrongly extended.json | 0 .../security/v2}/oauth2/flow/oauthFlow.json | 0 .../flow/passwordOAuthFlow - extended.json | 0 .../passwordOAuthFlow - wrongly extended.json | 0 .../v2}/oauth2/flow/passwordOAuthFlow.json | 0 .../v2}/oauth2/oauth2 - extended.json | 0 .../v2}/oauth2/oauth2 - wrongly extended.json | 0 .../security/v2}/oauth2/oauth2.json | 0 .../v2}/oauth2/oauthFlows - extended.json | 0 .../oauth2/oauthFlows - wrongly extended.json | 0 .../security/v2}/oauth2/oauthFlows.json | 0 .../v2}/openIdConnect - extended.json | 0 .../v2}/openIdConnect - wrongly extended.json | 0 .../security/v2}/openIdConnect.json | 0 .../security/v2}/plain - extended.json | 0 .../v2}/plain - wrongly extended.json | 0 .../security/v2}/plain.json | 0 .../security/v2}/scramSha256 - extended.json | 0 .../v2}/scramSha256 - wrongly extended.json | 0 .../security/v2}/scramSha256.json | 0 .../security/v2}/scramSha512 - extended.json | 0 .../v2}/scramSha512 - wrongly extended.json | 0 .../security/v2}/scramSha512.json | 0 .../v2}/symmetricEncryption - extended.json | 0 ...ymmetricEncryption - wrongly extended.json | 0 .../security/v2}/symmetricEncryption.json | 0 .../security/v2}/userPassword - extended.json | 0 .../v2}/userPassword - wrongly extended.json | 0 .../security/v2}/userPassword.json | 0 111 files changed, 415 insertions(+), 309 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/ApiKeySecurityScheme.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/OpenIdConnectSecurityScheme.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/SecurityScheme.java (94%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/http/HttpApiKeySecurityScheme.java (93%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/http/HttpSecurityScheme.java (93%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/OAuth2SecurityScheme.java (90%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/OAuthFlows.java (79%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/AuthorizationCodeOAuthFlow.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/ClientCredentialsOAuthFlow.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/ImplicitOAuthFlow.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/OAuthFlow.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/PasswordOAuthFlow.java (95%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/ApiKeySecuritySchemeTest.kt (58%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/AsymmetricEncryptionSecuritySchemeTest.kt (56%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/GssapiSecuritySchemeTest.kt (56%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/OpenIdConnectSecuritySchemeTest.kt (60%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/PlainSecuritySchemeTest.kt (56%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/ScramSha256SecuritySchemeTest.kt (56%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/ScramSha512SecuritySchemeTest.kt (56%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/SymmetricEncryptionSecuritySchemeTest.kt (56%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/UserPasswordSecuritySchemeTest.kt (56%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/X509SecuritySchemeTest.kt (56%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/http/HttpApiKeySecuritySchemeTest.kt (58%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/http/HttpSecuritySchemeTest.kt (54%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/OAuth2SecuritySchemeTest.kt (52%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/OAuthFlowTest.kt (58%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt (63%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/ClientCredentialsOAuthFlowTest.kt (61%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/ImplicitOAuthFlowTest.kt (61%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/OAuthFlowTest.kt (57%) rename asyncapi-core/src/test/kotlin/com/asyncapi/{v2/security_scheme => schemas/security/v2}/oauth2/flow/PasswordOAuthFlowTest.kt (61%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/X509 - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/X509 - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/X509.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/apiKey - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/apiKey - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/apiKey.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/asymmetricEncryption - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/asymmetricEncryption - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/asymmetricEncryption.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/gssapi - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/gssapi - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/gssapi.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/http/httpApiKey - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/http/httpApiKey - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/http/httpApiKey.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/http/httpBasic - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/http/httpBasic - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/http/httpBasic.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/http/httpBearer - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/http/httpBearer - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/http/httpBearer.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/authorizationCodeOAuthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/authorizationCodeOAuthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/clientCredentialsOAuthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/clientCredentialsOAuthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/implicitOAuthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/implicitOAuthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/implicitOAuthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/oauthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/oauthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/oauthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/passwordOAuthFlow - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/passwordOAuthFlow - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/flow/passwordOAuthFlow.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/oauth2 - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/oauth2 - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/oauth2.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/oauthFlows - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/oauthFlows - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/oauth2/oauthFlows.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/openIdConnect - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/openIdConnect - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/openIdConnect.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/plain - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/plain - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/plain.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/scramSha256 - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/scramSha256 - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/scramSha256.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/scramSha512 - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/scramSha512 - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/scramSha512.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/symmetricEncryption - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/symmetricEncryption - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/symmetricEncryption.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/userPassword - extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/userPassword - wrongly extended.json (100%) rename asyncapi-core/src/test/resources/{json/v2/security_scheme => schemas/security/v2}/userPassword.json (100%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/ApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/ApiKeySecurityScheme.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/ApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/ApiKeySecurityScheme.java index 81c899ba..5e9fddbe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/ApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/ApiKeySecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme; +package com.asyncapi.schemas.security.v2; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/OpenIdConnectSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/OpenIdConnectSecurityScheme.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/OpenIdConnectSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/OpenIdConnectSecurityScheme.java index 561e58d2..762af604 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/OpenIdConnectSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/OpenIdConnectSecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme; +package com.asyncapi.schemas.security.v2; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/SecurityScheme.java similarity index 94% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/SecurityScheme.java index 6f5e552c..cdaf7433 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/SecurityScheme.java @@ -1,9 +1,9 @@ -package com.asyncapi.v2.security_scheme; +package com.asyncapi.schemas.security.v2; import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.v2.security_scheme.http.HttpApiKeySecurityScheme; -import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme; -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme; +import com.asyncapi.schemas.security.v2.http.HttpApiKeySecurityScheme; +import com.asyncapi.schemas.security.v2.http.HttpSecurityScheme; +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpApiKeySecurityScheme.java similarity index 93% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpApiKeySecurityScheme.java index 9d8e0f12..6ab7ece9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpApiKeySecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.v2.security_scheme.http; +package com.asyncapi.schemas.security.v2.http; -import com.asyncapi.v2.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.v2.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpSecurityScheme.java similarity index 93% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpSecurityScheme.java index e6178101..57fcc8d1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/http/HttpSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpSecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.v2.security_scheme.http; +package com.asyncapi.schemas.security.v2.http; -import com.asyncapi.v2.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.v2.SecurityScheme; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecurityScheme.java similarity index 90% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecurityScheme.java index c8a009c8..8172ebab 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.v2.security_scheme.oauth2; +package com.asyncapi.schemas.security.v2.oauth2; -import com.asyncapi.v2.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.v2.SecurityScheme; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuthFlows.java similarity index 79% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuthFlows.java index 66a281c0..78991e1f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuthFlows.java @@ -1,10 +1,10 @@ -package com.asyncapi.v2.security_scheme.oauth2; +package com.asyncapi.schemas.security.v2.oauth2; import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.v2.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow; -import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow; -import com.asyncapi.v2.security_scheme.oauth2.flow.ImplicitOAuthFlow; -import com.asyncapi.v2.security_scheme.oauth2.flow.PasswordOAuthFlow; +import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow; +import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow; +import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow; +import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java index 34aeba7f..51652bf5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.v2.oauth2.flow; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java index bd202d98..8228df66 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.v2.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlow.java index 8dd05924..913af2bb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.v2.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlow.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlow.java index d6f65ca8..a3296e10 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.v2.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlow.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlow.java index 0499fa1a..27c513f7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow; +package com.asyncapi.schemas.security.v2.oauth2.flow; import com.asyncapi.schemas.ExtendableObject; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index f383674d..2514fdd6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; -import com.asyncapi.v2.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.v2.SecurityScheme; /** * Serializes component security schemes map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java index e0ecc9eb..119df6a6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java @@ -20,7 +20,7 @@ import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.bindings.ServerBindingsDeserializer; -import com.asyncapi.v2.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.v2.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index f97d14e1..b905fe9d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.Reference; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; -import com.asyncapi.v2.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.v2.SecurityScheme; public class ComponentsSecuritySchemesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index 5473e44b..9c1e0608 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -22,7 +22,7 @@ import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.bindings.ServerBindingsDeserializer; -import com.asyncapi.v2.security_scheme.SecurityScheme; +import com.asyncapi.schemas.security.v2.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt index 78b35275..184fc791 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt @@ -12,14 +12,14 @@ import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme -import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v2.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.security.v2.ApiKeySecurityScheme +import com.asyncapi.schemas.security.v2.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class CorrelationId: AbstractExampleValidationTest() { @@ -178,55 +178,72 @@ class CorrelationId: AbstractExampleValidationTest() { )) .securitySchemes(mapOf( Pair("apiKey", ApiKeySecurityScheme( - "Provide your API key as the user and leave the password empty.", - ApiKeySecurityScheme.ApiKeyLocation.USER - )), - Pair("supportedOauthFlows", OAuth2SecurityScheme( - "Flows to support OAuth 2.0", - OAuthFlows( - ImplicitOAuthFlow( - "", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) + ), + Pair("supportedOauthFlows", + OAuth2SecurityScheme( + "Flows to support OAuth 2.0", + OAuthFlows( + ImplicitOAuthFlow( + "", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/auth", ), - "https://authserver.example/auth", - ), - PasswordOAuthFlow( - "", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + PasswordOAuthFlow( + "", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/token", ), - "https://authserver.example/token", - ), - ClientCredentialsOAuthFlow( - "", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/token", ), - "https://authserver.example/token", - ), - AuthorizationCodeOAuthFlow( - "https://authserver.example/refresh", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), - ), - "https://authserver.example/auth", - "https://authserver.example/token", + AuthorizationCodeOAuthFlow( + "https://authserver.example/refresh", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/auth", + "https://authserver.example/token", + ) ) ) - )), - Pair("openIdConnectWellKnown", OpenIdConnectSecurityScheme( + ), + Pair("openIdConnectWellKnown", + OpenIdConnectSecurityScheme( null, "https://authserver.example/.well-known" - )) + ) + ) )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt index cef78ce5..8230e253 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt @@ -11,7 +11,7 @@ import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme +import com.asyncapi.schemas.security.v2.http.HttpSecurityScheme class GitterStreaming: AbstractExampleValidationTest() { @@ -81,11 +81,13 @@ class GitterStreaming: AbstractExampleValidationTest() { override fun expectedComponents(): Components? { return Components.builder() .securitySchemes(mapOf( - Pair("httpBearerToken", HttpSecurityScheme( + Pair("httpBearerToken", + HttpSecurityScheme( null, "bearer", null, - )) + ) + ) )) .messages(mapOf( Pair("chatMessage", Message.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt index 458e950a..0321203a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt @@ -9,9 +9,9 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow class OperationSecurity: AbstractExampleValidationTest() { @@ -175,19 +175,26 @@ class OperationSecurity: AbstractExampleValidationTest() { ), )) .securitySchemes(mapOf( - Pair("petstore_auth", OAuth2SecurityScheme( + Pair("petstore_auth", + OAuth2SecurityScheme( "The oauth security descriptions", OAuthFlows( - null, - null, - ClientCredentialsOAuthFlow( - "", - mapOf(Pair("subscribe:auth_revocations", "Scope required for authorization revocation topic")), - "https://example.com/api/oauth/dialog" + null, + null, + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair( + "subscribe:auth_revocations", + "Scope required for authorization revocation topic" + ) ), - null + "https://example.com/api/oauth/dialog" + ), + null ), - )) + ) + ) )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt index 9de4c6b4..f45c066a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.http.HttpApiKeySecurityScheme +import com.asyncapi.schemas.security.v2.http.HttpApiKeySecurityScheme class SlackRtm: AbstractExampleValidationTest() { @@ -60,10 +60,11 @@ class SlackRtm: AbstractExampleValidationTest() { return Components.builder() .securitySchemes(mapOf( Pair("token", HttpApiKeySecurityScheme( - null, - "token", - HttpApiKeySecurityScheme.ApiKeyLocation.QUERY - )) + null, + "token", + HttpApiKeySecurityScheme.ApiKeyLocation.QUERY + ) + ) )) .schemas(mapOf( Pair("attachment", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt index 7f6dff1d..93ad8d81 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt @@ -13,7 +13,7 @@ import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.SecurityScheme +import com.asyncapi.schemas.security.v2.SecurityScheme import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -216,10 +216,10 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .build() ), Pair("certs", - SecurityScheme( - SecurityScheme.Type.X509, - "Download the certificate files from service provider" - ) + SecurityScheme( + SecurityScheme.Type.X509, + "Download the certificate files from service provider" + ) ) )) .parameters(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt index 7c69bf10..d4b26b30 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt @@ -14,14 +14,14 @@ import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme -import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v2.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.security.v2.ApiKeySecurityScheme +import com.asyncapi.schemas.security.v2.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class StreetlightsMQTT: AbstractExampleValidationTest() { @@ -225,7 +225,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { )) .securitySchemes(mapOf( Pair("apiKey", - ApiKeySecurityScheme("Provide your API key as the user and leave the password empty.", ApiKeySecurityScheme.ApiKeyLocation.USER) + ApiKeySecurityScheme( + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) ), Pair("supportedOauthFlows", OAuth2SecurityScheme( @@ -235,7 +238,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { "", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/auth" @@ -244,7 +250,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { "", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/token" @@ -253,7 +262,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { "", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/token" @@ -262,7 +274,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { "https://authserver.example/refresh", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/auth", @@ -271,7 +286,12 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ) ) ), - Pair("openIdConnectWellKnown", OpenIdConnectSecurityScheme(null, "https://authserver.example/.well-known")) + Pair("openIdConnectWellKnown", + OpenIdConnectSecurityScheme( + null, + "https://authserver.example/.well-known" + ) + ) )) .parameters(mapOf( Pair("streetlightId", Parameter.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt index f0c447de..ba9facde 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt @@ -13,10 +13,10 @@ import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v2.SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -232,8 +232,14 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ClientCredentialsOAuthFlow( "", mapOf( - Pair("streetlights:read", "Scope required for subscribing to channel"), - Pair("streetlights:write", "Scope required for publishing to channel"), + Pair( + "streetlights:read", + "Scope required for subscribing to channel" + ), + Pair( + "streetlights:write", + "Scope required for publishing to channel" + ), ), "https://example.com/api/oauth/dialog", ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt index 8f2188ee..ca948e8b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt @@ -12,14 +12,14 @@ import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme -import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v2.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.security.v2.ApiKeySecurityScheme +import com.asyncapi.schemas.security.v2.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class CorrelationId: AbstractExampleValidationTest() { @@ -178,55 +178,72 @@ class CorrelationId: AbstractExampleValidationTest() { )) .securitySchemes(mapOf( Pair("apiKey", ApiKeySecurityScheme( - "Provide your API key as the user and leave the password empty.", - ApiKeySecurityScheme.ApiKeyLocation.USER - )), - Pair("supportedOauthFlows", OAuth2SecurityScheme( - "Flows to support OAuth 2.0", - OAuthFlows( - ImplicitOAuthFlow( - "", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) + ), + Pair("supportedOauthFlows", + OAuth2SecurityScheme( + "Flows to support OAuth 2.0", + OAuthFlows( + ImplicitOAuthFlow( + "", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/auth", ), - "https://authserver.example/auth", - ), - PasswordOAuthFlow( - "", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + PasswordOAuthFlow( + "", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/token", ), - "https://authserver.example/token", - ), - ClientCredentialsOAuthFlow( - "", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/token", ), - "https://authserver.example/token", - ), - AuthorizationCodeOAuthFlow( - "https://authserver.example/refresh", - mapOf( - Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), - Pair("streetlights:dim", "Ability to dim the lights"), - ), - "https://authserver.example/auth", - "https://authserver.example/token", + AuthorizationCodeOAuthFlow( + "https://authserver.example/refresh", + mapOf( + Pair("streetlights:on", "Ability to switch lights on"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), + Pair("streetlights:dim", "Ability to dim the lights"), + ), + "https://authserver.example/auth", + "https://authserver.example/token", + ) ) ) - )), - Pair("openIdConnectWellKnown", OpenIdConnectSecurityScheme( + ), + Pair("openIdConnectWellKnown", + OpenIdConnectSecurityScheme( null, "https://authserver.example/.well-known" - )) + ) + ) )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt index 88088989..7c36ae7f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt @@ -12,7 +12,7 @@ import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.http.HttpSecurityScheme +import com.asyncapi.schemas.security.v2.http.HttpSecurityScheme class GitterStreaming: AbstractExampleValidationTest() { @@ -84,11 +84,13 @@ class GitterStreaming: AbstractExampleValidationTest() { override fun expectedComponents(): Components? { return Components.builder() .securitySchemes(mapOf( - Pair("httpBearerToken", HttpSecurityScheme( + Pair("httpBearerToken", + HttpSecurityScheme( null, "bearer", null, - )) + ) + ) )) .messages(mapOf( Pair("chatMessage", Message.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt index ceba3db4..d603cb91 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt @@ -9,9 +9,9 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow class OperationSecurity: AbstractExampleValidationTest() { @@ -180,19 +180,26 @@ class OperationSecurity: AbstractExampleValidationTest() { ), )) .securitySchemes(mapOf( - Pair("petstore_auth", OAuth2SecurityScheme( + Pair("petstore_auth", + OAuth2SecurityScheme( "The oauth security descriptions", OAuthFlows( - null, - null, - ClientCredentialsOAuthFlow( - "", - mapOf(Pair("subscribe:auth_revocations", "Scope required for authorization revocation topic")), - "https://example.com/api/oauth/dialog" + null, + null, + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair( + "subscribe:auth_revocations", + "Scope required for authorization revocation topic" + ) ), - null + "https://example.com/api/oauth/dialog" + ), + null ), - )) + ) + ) )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt index b821eedb..d24527e3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt @@ -9,7 +9,7 @@ import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.http.HttpApiKeySecurityScheme +import com.asyncapi.schemas.security.v2.http.HttpApiKeySecurityScheme class SlackRtm: AbstractExampleValidationTest() { @@ -107,10 +107,11 @@ class SlackRtm: AbstractExampleValidationTest() { return Components.builder() .securitySchemes(mapOf( Pair("token", HttpApiKeySecurityScheme( - null, - "token", - HttpApiKeySecurityScheme.ApiKeyLocation.QUERY - )) + null, + "token", + HttpApiKeySecurityScheme.ApiKeyLocation.QUERY + ) + ) )) .schemas(mapOf( Pair("attachment", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt index 4bfcf7e4..dcd7bf6a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt @@ -14,7 +14,7 @@ import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.SecurityScheme +import com.asyncapi.schemas.security.v2.SecurityScheme import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -245,10 +245,10 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .build() ), Pair("certs", - SecurityScheme( - SecurityScheme.Type.X509, - "Download the certificate files from service provider" - ) + SecurityScheme( + SecurityScheme.Type.X509, + "Download the certificate files from service provider" + ) ) )) .parameters(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt index 0b008e2b..af4da8eb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt @@ -15,14 +15,14 @@ import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.ApiKeySecurityScheme -import com.asyncapi.v2.security_scheme.OpenIdConnectSecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v2.security_scheme.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.v2.security_scheme.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.security.v2.ApiKeySecurityScheme +import com.asyncapi.schemas.security.v2.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class StreetlightsMQTT: AbstractExampleValidationTest() { @@ -231,7 +231,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { )) .securitySchemes(mapOf( Pair("apiKey", - ApiKeySecurityScheme("Provide your API key as the user and leave the password empty.", ApiKeySecurityScheme.ApiKeyLocation.USER) + ApiKeySecurityScheme( + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) ), Pair("supportedOauthFlows", OAuth2SecurityScheme( @@ -241,7 +244,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { "", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/auth" @@ -250,7 +256,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { "", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/token" @@ -259,7 +268,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { "", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/token" @@ -268,7 +280,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { "https://authserver.example/refresh", mapOf( Pair("streetlights:on", "Ability to switch lights on"), - Pair("streetlights:off", "Ability to switch lights off"), + Pair( + "streetlights:off", + "Ability to switch lights off" + ), Pair("streetlights:dim", "Ability to dim the lights") ), "https://authserver.example/auth", @@ -277,7 +292,12 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ) ) ), - Pair("openIdConnectWellKnown", OpenIdConnectSecurityScheme(null, "https://authserver.example/.well-known")) + Pair("openIdConnectWellKnown", + OpenIdConnectSecurityScheme( + null, + "https://authserver.example/.well-known" + ) + ) )) .parameters(mapOf( Pair("streetlightId", Parameter.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt index 7d516dd5..e88d09a7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt @@ -13,10 +13,10 @@ import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.v2.security_scheme.SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecurityScheme -import com.asyncapi.v2.security_scheme.oauth2.OAuthFlows -import com.asyncapi.v2.security_scheme.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.security.v2.SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -239,8 +239,14 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ClientCredentialsOAuthFlow( "", mapOf( - Pair("streetlights:read", "Scope required for subscribing to channel"), - Pair("streetlights:write", "Scope required for publishing to channel"), + Pair( + "streetlights:read", + "Scope required for subscribing to channel" + ), + Pair( + "streetlights:write", + "Scope required for publishing to channel" + ), ), "https://example.com/api/oauth/dialog", ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/ApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ApiKeySecuritySchemeTest.kt similarity index 58% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/ApiKeySecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ApiKeySecuritySchemeTest.kt index 327f241a..d2717e34 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/ApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ApiKeySecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class ApiKeySecuritySchemeTest: SerDeTest() { override fun objectClass() = ApiKeySecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/apiKey.json" + override fun baseObjectJson() = "/schemas/security/v2/apiKey.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/apiKey - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/apiKey - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/apiKey - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/apiKey - wrongly extended.json" override fun build(): SecurityScheme { return ApiKeySecurityScheme.apiKeyBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/AsymmetricEncryptionSecuritySchemeTest.kt similarity index 56% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/AsymmetricEncryptionSecuritySchemeTest.kt index 4ed8707a..f5c83fbc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/AsymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/AsymmetricEncryptionSecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class AsymmetricEncryptionSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/asymmetricEncryption.json" + override fun baseObjectJson() = "/schemas/security/v2/asymmetricEncryption.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/asymmetricEncryption - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/asymmetricEncryption - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/asymmetricEncryption - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/asymmetricEncryption - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/GssapiSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/GssapiSecuritySchemeTest.kt similarity index 56% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/GssapiSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/GssapiSecuritySchemeTest.kt index 5823f19b..928fd282 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/GssapiSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/GssapiSecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class GssapiSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/gssapi.json" + override fun baseObjectJson() = "/schemas/security/v2/gssapi.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/gssapi - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/gssapi - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/gssapi - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/gssapi - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/OpenIdConnectSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/OpenIdConnectSecuritySchemeTest.kt similarity index 60% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/OpenIdConnectSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/OpenIdConnectSecuritySchemeTest.kt index 6a9eb726..7a9009d2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/OpenIdConnectSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/OpenIdConnectSecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class OpenIdConnectSecuritySchemeTest: SerDeTest() override fun objectClass() = OpenIdConnectSecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/openIdConnect.json" + override fun baseObjectJson() = "/schemas/security/v2/openIdConnect.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/openIdConnect - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/openIdConnect - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/openIdConnect - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/openIdConnect - wrongly extended.json" override fun build(): SecurityScheme { return OpenIdConnectSecurityScheme.openIdBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/PlainSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/PlainSecuritySchemeTest.kt similarity index 56% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/PlainSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/PlainSecuritySchemeTest.kt index 4adfd21a..2ccca2af 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/PlainSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/PlainSecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class PlainSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/plain.json" + override fun baseObjectJson() = "/schemas/security/v2/plain.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/plain - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/plain - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/plain - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/plain - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/ScramSha256SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha256SecuritySchemeTest.kt similarity index 56% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/ScramSha256SecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha256SecuritySchemeTest.kt index d60c5a29..2ac269c2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/ScramSha256SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha256SecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class ScramSha256SecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/scramSha256.json" + override fun baseObjectJson() = "/schemas/security/v2/scramSha256.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/scramSha256 - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/scramSha256 - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/scramSha256 - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/scramSha256 - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/ScramSha512SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha512SecuritySchemeTest.kt similarity index 56% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/ScramSha512SecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha512SecuritySchemeTest.kt index de3ea488..4e11d3af 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/ScramSha512SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha512SecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class ScramSha512SecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/scramSha512.json" + override fun baseObjectJson() = "/schemas/security/v2/scramSha512.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/scramSha512 - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/scramSha512 - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/scramSha512 - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/scramSha512 - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/SymmetricEncryptionSecuritySchemeTest.kt similarity index 56% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/SymmetricEncryptionSecuritySchemeTest.kt index 479a88c5..c5ec6954 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/SymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/SymmetricEncryptionSecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class SymmetricEncryptionSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/symmetricEncryption.json" + override fun baseObjectJson() = "/schemas/security/v2/symmetricEncryption.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/symmetricEncryption - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/symmetricEncryption - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/symmetricEncryption - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/symmetricEncryption - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/UserPasswordSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/UserPasswordSecuritySchemeTest.kt similarity index 56% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/UserPasswordSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/UserPasswordSecuritySchemeTest.kt index 59f9ecef..5e07c224 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/UserPasswordSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/UserPasswordSecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class UserPasswordSecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/userPassword.json" + override fun baseObjectJson() = "/schemas/security/v2/userPassword.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/userPassword - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/userPassword - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/userPassword - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/userPassword - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/X509SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/X509SecuritySchemeTest.kt similarity index 56% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/X509SecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/X509SecuritySchemeTest.kt index 3a18ab74..5ad78cdb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/X509SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/X509SecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme +package com.asyncapi.schemas.security.v2 import com.asyncapi.v2.SerDeTest @@ -9,11 +9,11 @@ class X509SecuritySchemeTest: SerDeTest() { override fun objectClass() = SecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/X509.json" + override fun baseObjectJson() = "/schemas/security/v2/X509.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/X509 - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/X509 - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/X509 - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/X509 - wrongly extended.json" override fun build(): SecurityScheme { return SecurityScheme.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/http/HttpApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpApiKeySecuritySchemeTest.kt similarity index 58% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/http/HttpApiKeySecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpApiKeySecuritySchemeTest.kt index 9b0a782d..d39b2a82 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/http/HttpApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpApiKeySecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.http +package com.asyncapi.schemas.security.v2.http import com.asyncapi.v2.SerDeTest @@ -6,11 +6,11 @@ class HttpApiKeySecuritySchemeTest: SerDeTest() { override fun objectClass() = HttpApiKeySecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/http/httpApiKey.json" + override fun baseObjectJson() = "/schemas/security/v2/http/httpApiKey.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/http/httpApiKey - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/http/httpApiKey - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/http/httpApiKey - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/http/httpApiKey - wrongly extended.json" override fun build(): HttpApiKeySecurityScheme { return HttpApiKeySecurityScheme.httpApiKeyBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/http/HttpSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpSecuritySchemeTest.kt similarity index 54% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/http/HttpSecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpSecuritySchemeTest.kt index 672d53ab..75c2f7fd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/http/HttpSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpSecuritySchemeTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.http +package com.asyncapi.schemas.security.v2.http import com.asyncapi.v2.SerDeTest @@ -6,11 +6,11 @@ class HttpSecuritySchemeBasicTest: SerDeTest() { override fun objectClass() = HttpSecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/http/httpBasic.json" + override fun baseObjectJson() = "/schemas/security/v2/http/httpBasic.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/http/httpBasic - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/http/httpBasic - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/http/httpBasic - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/http/httpBasic - wrongly extended.json" override fun build(): HttpSecurityScheme { return HttpSecurityScheme.httpBuilder() @@ -25,11 +25,11 @@ class HttpSecuritySchemeBearerTest: SerDeTest() { override fun objectClass() = HttpSecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/http/httpBearer.json" + override fun baseObjectJson() = "/schemas/security/v2/http/httpBearer.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/http/httpBearer - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/http/httpBearer - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/http/httpBearer - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/http/httpBearer - wrongly extended.json" override fun build(): HttpSecurityScheme { return HttpSecurityScheme.httpBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecuritySchemeTest.kt similarity index 52% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecuritySchemeTest.kt index 00c2d19d..240849ea 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/OAuth2SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecuritySchemeTest.kt @@ -1,7 +1,7 @@ -package com.asyncapi.v2.security_scheme.oauth2 +package com.asyncapi.schemas.security.v2.oauth2 import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.security_scheme.SecurityScheme +import com.asyncapi.schemas.security.v2.SecurityScheme /** * @author Pavel Bodiachevskii @@ -10,11 +10,11 @@ class OAuth2SecuritySchemeTest: SerDeTest() { override fun objectClass() = OAuth2SecurityScheme::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/oauth2/oauth2.json" + override fun baseObjectJson() = "/schemas/security/v2/oauth2/oauth2.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/oauth2/oauth2 - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/oauth2/oauth2 - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/oauth2/oauth2 - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/oauth2/oauth2 - wrongly extended.json" override fun build(): SecurityScheme { return OAuth2SecurityScheme.oauth2Builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuthFlowTest.kt similarity index 58% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/OAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuthFlowTest.kt index 1841a203..2070c33b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/OAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuthFlowTest.kt @@ -1,7 +1,7 @@ -package com.asyncapi.v2.security_scheme.oauth2 +package com.asyncapi.schemas.security.v2.oauth2 import com.asyncapi.v2.SerDeTest -import com.asyncapi.v2.security_scheme.oauth2.flow.* +import com.asyncapi.schemas.security.v2.oauth2.flow.* /** * @author Pavel Bodiachevskii @@ -10,11 +10,11 @@ class OAuthFlowTest: SerDeTest() { override fun objectClass() = OAuthFlows::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/oauth2/oauthFlows.json" + override fun baseObjectJson() = "/schemas/security/v2/oauth2/oauthFlows.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/oauth2/oauthFlows - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/oauth2/oauthFlows - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/oauth2/oauthFlows - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/oauth2/oauthFlows - wrongly extended.json" override fun build(): OAuthFlows { return OAuthFlows.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt similarity index 63% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt index c71ae840..7bfcda03 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v2.oauth2.flow import com.asyncapi.v2.SerDeTest @@ -6,11 +6,11 @@ class AuthorizationCodeOAuthFlowTest: SerDeTest() { override fun objectClass() = AuthorizationCodeOAuthFlow::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/oauth2/flow/authorizationCodeOAuthFlow.json" + override fun baseObjectJson() = "/schemas/security/v2/oauth2/flow/authorizationCodeOAuthFlow.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/oauth2/flow/authorizationCodeOAuthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json" override fun build(): AuthorizationCodeOAuthFlow { return AuthorizationCodeOAuthFlow.authorizationCodeBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlowTest.kt similarity index 61% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlowTest.kt index cca55c8a..f9201848 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/ClientCredentialsOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlowTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v2.oauth2.flow import com.asyncapi.v2.SerDeTest @@ -6,11 +6,11 @@ class ClientCredentialsOAuthFlowTest: SerDeTest() { override fun objectClass() = ClientCredentialsOAuthFlow::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/oauth2/flow/clientCredentialsOAuthFlow.json" + override fun baseObjectJson() = "/schemas/security/v2/oauth2/flow/clientCredentialsOAuthFlow.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/oauth2/flow/clientCredentialsOAuthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json" override fun build(): ClientCredentialsOAuthFlow { return ClientCredentialsOAuthFlow.clientCredentialsBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlowTest.kt similarity index 61% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlowTest.kt index 452606d0..8871d720 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/ImplicitOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlowTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v2.oauth2.flow import com.asyncapi.v2.SerDeTest @@ -6,11 +6,11 @@ class ImplicitOAuthFlowTest: SerDeTest() { override fun objectClass() = ImplicitOAuthFlow::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/oauth2/flow/implicitOAuthFlow.json" + override fun baseObjectJson() = "/schemas/security/v2/oauth2/flow/implicitOAuthFlow.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/implicitOAuthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/oauth2/flow/implicitOAuthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/implicitOAuthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/oauth2/flow/implicitOAuthFlow - wrongly extended.json" override fun build(): ImplicitOAuthFlow { return ImplicitOAuthFlow.implicitBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlowTest.kt similarity index 57% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlowTest.kt index b2dde97b..1d16ee7c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/OAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlowTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v2.oauth2.flow import com.asyncapi.v2.SerDeTest @@ -6,11 +6,11 @@ class OAuthFlowTest: SerDeTest() { override fun objectClass() = OAuthFlow::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/oauth2/flow/oauthFlow.json" + override fun baseObjectJson() = "/schemas/security/v2/oauth2/flow/oauthFlow.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/oauthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/oauth2/flow/oauthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/oauthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/oauth2/flow/oauthFlow - wrongly extended.json" override fun build(): OAuthFlow { return OAuthFlow.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlowTest.kt similarity index 61% rename from asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt rename to asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlowTest.kt index db1013cb..bb96e564 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/security_scheme/oauth2/flow/PasswordOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlowTest.kt @@ -1,4 +1,4 @@ -package com.asyncapi.v2.security_scheme.oauth2.flow +package com.asyncapi.schemas.security.v2.oauth2.flow import com.asyncapi.v2.SerDeTest @@ -6,11 +6,11 @@ class PasswordOAuthFlowTest: SerDeTest() { override fun objectClass() = PasswordOAuthFlow::class.java - override fun baseObjectJson() = "/json/v2/security_scheme/oauth2/flow/passwordOAuthFlow.json" + override fun baseObjectJson() = "/schemas/security/v2/oauth2/flow/passwordOAuthFlow.json" - override fun extendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/passwordOAuthFlow - extended.json" + override fun extendedObjectJson() = "/schemas/security/v2/oauth2/flow/passwordOAuthFlow - extended.json" - override fun wronglyExtendedObjectJson() = "/json/v2/security_scheme/oauth2/flow/passwordOAuthFlow - wrongly extended.json" + override fun wronglyExtendedObjectJson() = "/schemas/security/v2/oauth2/flow/passwordOAuthFlow - wrongly extended.json" override fun build(): PasswordOAuthFlow { return PasswordOAuthFlow.passwordBuilder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt index 4f0ae757..118791d9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt @@ -12,12 +12,12 @@ import com.asyncapi.v2._0_0.model.channel.operation.OperationTraitTest import com.asyncapi.schemas.AsyncAPISchema import com.asyncapi.schemas.Type import com.asyncapi.v2._0_0.model.server.ServerTest -import com.asyncapi.v2.security_scheme.ApiKeySecuritySchemeTest -import com.asyncapi.v2.security_scheme.OpenIdConnectSecuritySchemeTest -import com.asyncapi.v2.security_scheme.http.HttpApiKeySecuritySchemeTest -import com.asyncapi.v2.security_scheme.http.HttpSecuritySchemeBasicTest -import com.asyncapi.v2.security_scheme.http.HttpSecuritySchemeBearerTest -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecuritySchemeTest +import com.asyncapi.schemas.security.v2.ApiKeySecuritySchemeTest +import com.asyncapi.schemas.security.v2.OpenIdConnectSecuritySchemeTest +import com.asyncapi.schemas.security.v2.http.HttpApiKeySecuritySchemeTest +import com.asyncapi.schemas.security.v2.http.HttpSecuritySchemeBasicTest +import com.asyncapi.schemas.security.v2.http.HttpSecuritySchemeBearerTest +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecuritySchemeTest /** * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt index e71d1916..0e0436d9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt @@ -14,12 +14,12 @@ import com.asyncapi.v2._6_0.model.channel.operation.OperationTest import com.asyncapi.v2._6_0.model.channel.operation.OperationTraitTest import com.asyncapi.v2._6_0.model.server.ServerTest import com.asyncapi.v2._6_0.model.server.ServerVariableTest -import com.asyncapi.v2.security_scheme.ApiKeySecuritySchemeTest -import com.asyncapi.v2.security_scheme.OpenIdConnectSecuritySchemeTest -import com.asyncapi.v2.security_scheme.http.HttpApiKeySecuritySchemeTest -import com.asyncapi.v2.security_scheme.http.HttpSecuritySchemeBasicTest -import com.asyncapi.v2.security_scheme.http.HttpSecuritySchemeBearerTest -import com.asyncapi.v2.security_scheme.oauth2.OAuth2SecuritySchemeTest +import com.asyncapi.schemas.security.v2.ApiKeySecuritySchemeTest +import com.asyncapi.schemas.security.v2.OpenIdConnectSecuritySchemeTest +import com.asyncapi.schemas.security.v2.http.HttpApiKeySecuritySchemeTest +import com.asyncapi.schemas.security.v2.http.HttpSecuritySchemeBasicTest +import com.asyncapi.schemas.security.v2.http.HttpSecuritySchemeBearerTest +import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecuritySchemeTest /** * @version 2.6.0 diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/X509 - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/X509 - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/X509 - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/X509 - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/X509 - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/X509 - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/X509 - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/X509 - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/X509.json b/asyncapi-core/src/test/resources/schemas/security/v2/X509.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/X509.json rename to asyncapi-core/src/test/resources/schemas/security/v2/X509.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/apiKey - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/apiKey - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/apiKey - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/apiKey - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/apiKey - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/apiKey - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/apiKey - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/apiKey - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/apiKey.json b/asyncapi-core/src/test/resources/schemas/security/v2/apiKey.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/apiKey.json rename to asyncapi-core/src/test/resources/schemas/security/v2/apiKey.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/asymmetricEncryption - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/asymmetricEncryption - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/asymmetricEncryption - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/asymmetricEncryption - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/asymmetricEncryption - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/asymmetricEncryption - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/asymmetricEncryption - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/asymmetricEncryption - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/asymmetricEncryption.json b/asyncapi-core/src/test/resources/schemas/security/v2/asymmetricEncryption.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/asymmetricEncryption.json rename to asyncapi-core/src/test/resources/schemas/security/v2/asymmetricEncryption.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/gssapi - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/gssapi - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/gssapi - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/gssapi - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/gssapi - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/gssapi - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/gssapi - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/gssapi - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/gssapi.json b/asyncapi-core/src/test/resources/schemas/security/v2/gssapi.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/gssapi.json rename to asyncapi-core/src/test/resources/schemas/security/v2/gssapi.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpApiKey - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/http/httpApiKey - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpApiKey - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/http/httpApiKey - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpApiKey - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/http/httpApiKey - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpApiKey - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/http/httpApiKey - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpApiKey.json b/asyncapi-core/src/test/resources/schemas/security/v2/http/httpApiKey.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpApiKey.json rename to asyncapi-core/src/test/resources/schemas/security/v2/http/httpApiKey.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/http/httpBasic - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/http/httpBasic - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/http/httpBasic - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/http/httpBasic - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic.json b/asyncapi-core/src/test/resources/schemas/security/v2/http/httpBasic.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBasic.json rename to asyncapi-core/src/test/resources/schemas/security/v2/http/httpBasic.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBearer - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/http/httpBearer - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBearer - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/http/httpBearer - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBearer - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/http/httpBearer - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBearer - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/http/httpBearer - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBearer.json b/asyncapi-core/src/test/resources/schemas/security/v2/http/httpBearer.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/http/httpBearer.json rename to asyncapi-core/src/test/resources/schemas/security/v2/http/httpBearer.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/authorizationCodeOAuthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/authorizationCodeOAuthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/authorizationCodeOAuthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/authorizationCodeOAuthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/authorizationCodeOAuthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/authorizationCodeOAuthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/authorizationCodeOAuthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/clientCredentialsOAuthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/clientCredentialsOAuthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/clientCredentialsOAuthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/clientCredentialsOAuthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/clientCredentialsOAuthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/clientCredentialsOAuthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/clientCredentialsOAuthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/implicitOAuthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/implicitOAuthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/implicitOAuthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/implicitOAuthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/implicitOAuthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/implicitOAuthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/implicitOAuthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/implicitOAuthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/implicitOAuthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/implicitOAuthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/implicitOAuthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/implicitOAuthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/oauthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/oauthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/oauthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/oauthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/oauthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/oauthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/oauthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/oauthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/oauthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/oauthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/oauthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/oauthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/passwordOAuthFlow - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/passwordOAuthFlow - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/passwordOAuthFlow - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/passwordOAuthFlow - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/passwordOAuthFlow - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/passwordOAuthFlow - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/passwordOAuthFlow - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/passwordOAuthFlow - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/passwordOAuthFlow.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/passwordOAuthFlow.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/flow/passwordOAuthFlow.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/flow/passwordOAuthFlow.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauth2 - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauth2 - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauth2 - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauth2 - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauth2 - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauth2 - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauth2 - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauth2 - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauth2.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauth2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauth2.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauth2.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauthFlows - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauthFlows - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauthFlows - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauthFlows - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauthFlows - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauthFlows - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauthFlows - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauthFlows - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauthFlows.json b/asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauthFlows.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/oauth2/oauthFlows.json rename to asyncapi-core/src/test/resources/schemas/security/v2/oauth2/oauthFlows.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/openIdConnect - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/openIdConnect - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/openIdConnect - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/openIdConnect - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/openIdConnect - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/openIdConnect - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/openIdConnect - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/openIdConnect - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/openIdConnect.json b/asyncapi-core/src/test/resources/schemas/security/v2/openIdConnect.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/openIdConnect.json rename to asyncapi-core/src/test/resources/schemas/security/v2/openIdConnect.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/plain - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/plain - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/plain - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/plain - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/plain - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/plain - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/plain - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/plain - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/plain.json b/asyncapi-core/src/test/resources/schemas/security/v2/plain.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/plain.json rename to asyncapi-core/src/test/resources/schemas/security/v2/plain.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha256 - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/scramSha256 - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha256 - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/scramSha256 - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha256 - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/scramSha256 - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha256 - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/scramSha256 - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha256.json b/asyncapi-core/src/test/resources/schemas/security/v2/scramSha256.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha256.json rename to asyncapi-core/src/test/resources/schemas/security/v2/scramSha256.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha512 - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/scramSha512 - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha512 - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/scramSha512 - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha512 - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/scramSha512 - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha512 - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/scramSha512 - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha512.json b/asyncapi-core/src/test/resources/schemas/security/v2/scramSha512.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/scramSha512.json rename to asyncapi-core/src/test/resources/schemas/security/v2/scramSha512.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/symmetricEncryption - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/symmetricEncryption - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/symmetricEncryption - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/symmetricEncryption - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/symmetricEncryption - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/symmetricEncryption - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/symmetricEncryption - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/symmetricEncryption - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/symmetricEncryption.json b/asyncapi-core/src/test/resources/schemas/security/v2/symmetricEncryption.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/symmetricEncryption.json rename to asyncapi-core/src/test/resources/schemas/security/v2/symmetricEncryption.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/userPassword - extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/userPassword - extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/userPassword - extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/userPassword - extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/userPassword - wrongly extended.json b/asyncapi-core/src/test/resources/schemas/security/v2/userPassword - wrongly extended.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/userPassword - wrongly extended.json rename to asyncapi-core/src/test/resources/schemas/security/v2/userPassword - wrongly extended.json diff --git a/asyncapi-core/src/test/resources/json/v2/security_scheme/userPassword.json b/asyncapi-core/src/test/resources/schemas/security/v2/userPassword.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v2/security_scheme/userPassword.json rename to asyncapi-core/src/test/resources/schemas/security/v2/userPassword.json From 6dde30682d57ae148f4eaa33290d3be1aa4335e9 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 8 May 2024 02:09:56 +0400 Subject: [PATCH 091/141] tests(schemas): move Json test resources --- .../schemas/ReadJsonPropertiesTest.kt | 34 +++++++++---------- .../asyncapi/schemas/ReadJsonSchemaTest.kt | 14 ++++---- .../json/arrays.schema.json | 0 .../json/complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../json/enumerated-values.schema.json | 0 .../json/person.schema.json | 0 .../json/properties/array.json | 0 .../json/properties/bigdecimal-maximum.json | 0 .../json/properties/bigdecimal-minimum.json | 0 .../json/properties/bigdecimal.json | 0 .../json/properties/biginteger-maximum.json | 0 .../json/properties/biginteger-minimum.json | 0 .../json/properties/biginteger.json | 0 .../json/properties/boolean-false.json | 0 .../json/properties/boolean-true.json | 0 .../json/properties/double-maximum.json | 0 .../json/properties/double-minimum.json | 0 .../json/properties/double.json | 0 .../json/properties/float-maximum.json | 0 .../json/properties/float-minimum.json | 0 .../json/properties/float.json | 0 .../json/properties/int-maximum.json | 0 .../json/properties/int-minimum.json | 0 .../json/properties/int.json | 0 .../json/properties/null.json | 0 .../json/properties/object.json | 0 .../json/regex-pattern.schema.json | 0 29 files changed, 24 insertions(+), 24 deletions(-) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/array.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/bigdecimal-maximum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/bigdecimal-minimum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/bigdecimal.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/biginteger-maximum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/biginteger-minimum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/biginteger.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/boolean-false.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/boolean-true.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/double-maximum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/double-minimum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/double.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/float-maximum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/float-minimum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/float.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/int-maximum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/int-minimum.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/int.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/null.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/properties/object.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/json/regex-pattern.schema.json (100%) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt index 6b77553f..29bc764d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt @@ -68,30 +68,30 @@ class ReadJsonPropertiesTest { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/json/properties/bigdecimal.json", ConstDefaultExamplesBigDecimalTest()), - Arguments.of("/json/v3/schema/json/properties/bigdecimal-maximum.json", ConstDefaultExamplesBigDecimalMaximumTest()), - Arguments.of("/json/v3/schema/json/properties/bigdecimal-minimum.json", ConstDefaultExamplesBigDecimalMinimumTest()), + Arguments.of("/schemas/json/properties/bigdecimal.json", ConstDefaultExamplesBigDecimalTest()), + Arguments.of("/schemas/json/properties/bigdecimal-maximum.json", ConstDefaultExamplesBigDecimalMaximumTest()), + Arguments.of("/schemas/json/properties/bigdecimal-minimum.json", ConstDefaultExamplesBigDecimalMinimumTest()), - Arguments.of("/json/v3/schema/json/properties/biginteger.json", ConstDefaultExamplesBigIntegerTest()), - Arguments.of("/json/v3/schema/json/properties/biginteger-maximum.json", ConstDefaultExamplesBigIntegerMaximumTest()), - Arguments.of("/json/v3/schema/json/properties/biginteger-minimum.json", ConstDefaultExamplesBigIntegerMinimumTest()), + Arguments.of("/schemas/json/properties/biginteger.json", ConstDefaultExamplesBigIntegerTest()), + Arguments.of("/schemas/json/properties/biginteger-maximum.json", ConstDefaultExamplesBigIntegerMaximumTest()), + Arguments.of("/schemas/json/properties/biginteger-minimum.json", ConstDefaultExamplesBigIntegerMinimumTest()), - Arguments.of("/json/v3/schema/json/properties/boolean-false.json", ConstDefaultExamplesBooleanFalseTest()), - Arguments.of("/json/v3/schema/json/properties/boolean-true.json", ConstDefaultExamplesBooleanTrueTest()), + Arguments.of("/schemas/json/properties/boolean-false.json", ConstDefaultExamplesBooleanFalseTest()), + Arguments.of("/schemas/json/properties/boolean-true.json", ConstDefaultExamplesBooleanTrueTest()), - Arguments.of("/json/v3/schema/json/properties/double.json", ConstDefaultExamplesDoubleTest()), - Arguments.of("/json/v3/schema/json/properties/double-maximum.json", ConstDefaultExamplesDoubleMaximumTest()), - Arguments.of("/json/v3/schema/json/properties/double-minimum.json", ConstDefaultExamplesDoubleMinimumTest()), + Arguments.of("/schemas/json/properties/double.json", ConstDefaultExamplesDoubleTest()), + Arguments.of("/schemas/json/properties/double-maximum.json", ConstDefaultExamplesDoubleMaximumTest()), + Arguments.of("/schemas/json/properties/double-minimum.json", ConstDefaultExamplesDoubleMinimumTest()), - Arguments.of("/json/v3/schema/json/properties/int.json", ConstDefaultExamplesIntTest()), - Arguments.of("/json/v3/schema/json/properties/int-maximum.json", ConstDefaultExamplesIntMaximumTest()), - Arguments.of("/json/v3/schema/json/properties/int-minimum.json", ConstDefaultExamplesIntMinimumTest()), + Arguments.of("/schemas/json/properties/int.json", ConstDefaultExamplesIntTest()), + Arguments.of("/schemas/json/properties/int-maximum.json", ConstDefaultExamplesIntMaximumTest()), + Arguments.of("/schemas/json/properties/int-minimum.json", ConstDefaultExamplesIntMinimumTest()), - Arguments.of("/json/v3/schema/json/properties/null.json", ConstDefaultExamplesNullTest()), + Arguments.of("/schemas/json/properties/null.json", ConstDefaultExamplesNullTest()), - Arguments.of("/json/v3/schema/json/properties/object.json", ConstDefaultExamplesObjectTest()), + Arguments.of("/schemas/json/properties/object.json", ConstDefaultExamplesObjectTest()), - Arguments.of("/json/v3/schema/json/properties/array.json", ConstDefaultExamplesArrayTest()), + Arguments.of("/schemas/json/properties/array.json", ConstDefaultExamplesArrayTest()), ) } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt index e4420412..2839f1a5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt @@ -58,13 +58,13 @@ class ReadJsonSchemaTest { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/json/arrays.schema.json", ArraysSchemaTest()), - Arguments.of("/json/v3/schema/json/complex-object.schema.json", ComplexObjectTest()), - Arguments.of("/json/v3/schema/json/conditional-validation-if-else.schema.json", ConditionalValidationIfElse()), - Arguments.of("/json/v3/schema/json/draft-07-core-schema-meta-schema.json", Draft07CoreSchemaMetaSchemaTest()), - Arguments.of("/json/v3/schema/json/enumerated-values.schema.json", EnumeratedValuesTest()), - Arguments.of("/json/v3/schema/json/person.schema.json", PersonTest()), - Arguments.of("/json/v3/schema/json/regex-pattern.schema.json", RegexPatternTest()) + Arguments.of("/schemas/json/arrays.schema.json", ArraysSchemaTest()), + Arguments.of("/schemas/json/complex-object.schema.json", ComplexObjectTest()), + Arguments.of("/schemas/json/conditional-validation-if-else.schema.json", ConditionalValidationIfElse()), + Arguments.of("/schemas/json/draft-07-core-schema-meta-schema.json", Draft07CoreSchemaMetaSchemaTest()), + Arguments.of("/schemas/json/enumerated-values.schema.json", EnumeratedValuesTest()), + Arguments.of("/schemas/json/person.schema.json", PersonTest()), + Arguments.of("/schemas/json/regex-pattern.schema.json", RegexPatternTest()) ) } diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/person.schema.json b/asyncapi-core/src/test/resources/schemas/json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/array.json b/asyncapi-core/src/test/resources/schemas/json/properties/array.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/array.json rename to asyncapi-core/src/test/resources/schemas/json/properties/array.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/bigdecimal-maximum.json b/asyncapi-core/src/test/resources/schemas/json/properties/bigdecimal-maximum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/bigdecimal-maximum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/bigdecimal-maximum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/bigdecimal-minimum.json b/asyncapi-core/src/test/resources/schemas/json/properties/bigdecimal-minimum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/bigdecimal-minimum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/bigdecimal-minimum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/bigdecimal.json b/asyncapi-core/src/test/resources/schemas/json/properties/bigdecimal.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/bigdecimal.json rename to asyncapi-core/src/test/resources/schemas/json/properties/bigdecimal.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/biginteger-maximum.json b/asyncapi-core/src/test/resources/schemas/json/properties/biginteger-maximum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/biginteger-maximum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/biginteger-maximum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/biginteger-minimum.json b/asyncapi-core/src/test/resources/schemas/json/properties/biginteger-minimum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/biginteger-minimum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/biginteger-minimum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/biginteger.json b/asyncapi-core/src/test/resources/schemas/json/properties/biginteger.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/biginteger.json rename to asyncapi-core/src/test/resources/schemas/json/properties/biginteger.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/boolean-false.json b/asyncapi-core/src/test/resources/schemas/json/properties/boolean-false.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/boolean-false.json rename to asyncapi-core/src/test/resources/schemas/json/properties/boolean-false.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/boolean-true.json b/asyncapi-core/src/test/resources/schemas/json/properties/boolean-true.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/boolean-true.json rename to asyncapi-core/src/test/resources/schemas/json/properties/boolean-true.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/double-maximum.json b/asyncapi-core/src/test/resources/schemas/json/properties/double-maximum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/double-maximum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/double-maximum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/double-minimum.json b/asyncapi-core/src/test/resources/schemas/json/properties/double-minimum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/double-minimum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/double-minimum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/double.json b/asyncapi-core/src/test/resources/schemas/json/properties/double.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/double.json rename to asyncapi-core/src/test/resources/schemas/json/properties/double.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/float-maximum.json b/asyncapi-core/src/test/resources/schemas/json/properties/float-maximum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/float-maximum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/float-maximum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/float-minimum.json b/asyncapi-core/src/test/resources/schemas/json/properties/float-minimum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/float-minimum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/float-minimum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/float.json b/asyncapi-core/src/test/resources/schemas/json/properties/float.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/float.json rename to asyncapi-core/src/test/resources/schemas/json/properties/float.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/int-maximum.json b/asyncapi-core/src/test/resources/schemas/json/properties/int-maximum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/int-maximum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/int-maximum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/int-minimum.json b/asyncapi-core/src/test/resources/schemas/json/properties/int-minimum.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/int-minimum.json rename to asyncapi-core/src/test/resources/schemas/json/properties/int-minimum.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/int.json b/asyncapi-core/src/test/resources/schemas/json/properties/int.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/int.json rename to asyncapi-core/src/test/resources/schemas/json/properties/int.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/null.json b/asyncapi-core/src/test/resources/schemas/json/properties/null.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/null.json rename to asyncapi-core/src/test/resources/schemas/json/properties/null.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/properties/object.json b/asyncapi-core/src/test/resources/schemas/json/properties/object.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/properties/object.json rename to asyncapi-core/src/test/resources/schemas/json/properties/object.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/json/regex-pattern.schema.json From d294fe107733138f9e19a0c2028697911751f9a7 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 8 May 2024 02:10:52 +0400 Subject: [PATCH 092/141] tests(schemas): move Avro test resources --- .../com/asyncapi/schemas/avro/AvroTest.kt | 36 +++++++++---------- .../avro/ApplicationEvent.avsc | 0 .../schema => schemas}/avro/DocumentInfo.avsc | 0 .../schema => schemas}/avro/MyResponse.avsc | 0 .../avro/SchemaBuilder.avsc | 0 .../avro/TestRecordWithLogicalTypes.avsc | 0 .../avro/TestRecordWithMapsAndArrays.avsc | 0 .../avro/TestUnionRecord.avsc | 0 .../v3/schema => schemas}/avro/foo.Bar.avsc | 0 .../avro/full_record_v1.avsc | 0 .../avro/full_record_v2.avsc | 0 .../schema => schemas}/avro/logical-uuid.avsc | 0 .../logical_types_with_multiple_fields.avsc | 0 .../regression_error_field_in_record.avsc | 0 .../avro/schema-location-read.json | 0 .../avro/schema-location-write.json | 0 .../avro/schema-location.json | 0 .../avro/simple_record.avsc | 0 .../avro/union_and_fixed_fields.avsc | 0 19 files changed, 18 insertions(+), 18 deletions(-) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/ApplicationEvent.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/DocumentInfo.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/MyResponse.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/SchemaBuilder.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/TestRecordWithLogicalTypes.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/TestRecordWithMapsAndArrays.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/TestUnionRecord.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/foo.Bar.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/full_record_v1.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/full_record_v2.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/logical-uuid.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/logical_types_with_multiple_fields.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/regression_error_field_in_record.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/simple_record.avsc (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/avro/union_and_fixed_fields.avsc (100%) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroTest.kt index 7eb641ea..3dc9a5b0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/avro/AvroTest.kt @@ -41,24 +41,24 @@ class AvroSchemaSchemaTest { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/avro/ApplicationEvent.avsc", AvroSchema::class.java, AvroSchemasProvider().applicationEventTest()), - Arguments.of("/json/v3/schema/avro/DocumentInfo.avsc", AvroSchema::class.java, AvroSchemasProvider().documentInfo()), - Arguments.of("/json/v3/schema/avro/foo.Bar.avsc", AvroSchema::class.java, AvroSchemasProvider().fooBar()), - Arguments.of("/json/v3/schema/avro/full_record_v1.avsc", AvroSchema::class.java, AvroSchemasProvider().fullRecordV1()), - Arguments.of("/json/v3/schema/avro/full_record_v2.avsc", AvroSchema::class.java, AvroSchemasProvider().fullRecordV2()), - Arguments.of("/json/v3/schema/avro/logical-uuid.avsc", AvroSchema::class.java, AvroSchemasProvider().logicalUUID()), - Arguments.of("/json/v3/schema/avro/logical_types_with_multiple_fields.avsc", AvroSchema::class.java, AvroSchemasProvider().logicalTypesWithMultipleFields()), - Arguments.of("/json/v3/schema/avro/MyResponse.avsc", AvroSchema::class.java, AvroSchemasProvider().myResponse()), - Arguments.of("/json/v3/schema/avro/regression_error_field_in_record.avsc", AvroSchema::class.java, AvroSchemasProvider().regressionErrorFieldInRecord()), - Arguments.of("/json/v3/schema/avro/schema-location.json", AvroSchema::class.java, AvroSchemasProvider().schemaLocation()), - Arguments.of("/json/v3/schema/avro/schema-location-read.json", AvroSchema::class.java, AvroSchemasProvider().schemaLocationRead()), - Arguments.of("/json/v3/schema/avro/schema-location-write.json", AvroSchema::class.java, AvroSchemasProvider().schemaLocationWrite()), - Arguments.of("/json/v3/schema/avro/SchemaBuilder.avsc", AvroSchema::class.java, AvroSchemasProvider().schemaBuilder()), - Arguments.of("/json/v3/schema/avro/simple_record.avsc", AvroSchema::class.java, AvroSchemasProvider().simpleRecord()), - Arguments.of("/json/v3/schema/avro/TestRecordWithLogicalTypes.avsc", AvroSchema::class.java, AvroSchemasProvider().testRecordWithLogicalTypes()), - Arguments.of("/json/v3/schema/avro/TestRecordWithMapsAndArrays.avsc", AvroSchema::class.java, AvroSchemasProvider().testRecordWithMapsAndArrays()), - Arguments.of("/json/v3/schema/avro/TestUnionRecord.avsc", AvroSchemaUnion::class.java, AvroSchemasProvider().testUnionRecord()), - Arguments.of("/json/v3/schema/avro/union_and_fixed_fields.avsc", AvroSchema::class.java, AvroSchemasProvider().unionAndFixedFields()), + Arguments.of("/schemas/avro/ApplicationEvent.avsc", AvroSchema::class.java, AvroSchemasProvider().applicationEventTest()), + Arguments.of("/schemas/avro/DocumentInfo.avsc", AvroSchema::class.java, AvroSchemasProvider().documentInfo()), + Arguments.of("/schemas/avro/foo.Bar.avsc", AvroSchema::class.java, AvroSchemasProvider().fooBar()), + Arguments.of("/schemas/avro/full_record_v1.avsc", AvroSchema::class.java, AvroSchemasProvider().fullRecordV1()), + Arguments.of("/schemas/avro/full_record_v2.avsc", AvroSchema::class.java, AvroSchemasProvider().fullRecordV2()), + Arguments.of("/schemas/avro/logical-uuid.avsc", AvroSchema::class.java, AvroSchemasProvider().logicalUUID()), + Arguments.of("/schemas/avro/logical_types_with_multiple_fields.avsc", AvroSchema::class.java, AvroSchemasProvider().logicalTypesWithMultipleFields()), + Arguments.of("/schemas/avro/MyResponse.avsc", AvroSchema::class.java, AvroSchemasProvider().myResponse()), + Arguments.of("/schemas/avro/regression_error_field_in_record.avsc", AvroSchema::class.java, AvroSchemasProvider().regressionErrorFieldInRecord()), + Arguments.of("/schemas/avro/schema-location.json", AvroSchema::class.java, AvroSchemasProvider().schemaLocation()), + Arguments.of("/schemas/avro/schema-location-read.json", AvroSchema::class.java, AvroSchemasProvider().schemaLocationRead()), + Arguments.of("/schemas/avro/schema-location-write.json", AvroSchema::class.java, AvroSchemasProvider().schemaLocationWrite()), + Arguments.of("/schemas/avro/SchemaBuilder.avsc", AvroSchema::class.java, AvroSchemasProvider().schemaBuilder()), + Arguments.of("/schemas/avro/simple_record.avsc", AvroSchema::class.java, AvroSchemasProvider().simpleRecord()), + Arguments.of("/schemas/avro/TestRecordWithLogicalTypes.avsc", AvroSchema::class.java, AvroSchemasProvider().testRecordWithLogicalTypes()), + Arguments.of("/schemas/avro/TestRecordWithMapsAndArrays.avsc", AvroSchema::class.java, AvroSchemasProvider().testRecordWithMapsAndArrays()), + Arguments.of("/schemas/avro/TestUnionRecord.avsc", AvroSchemaUnion::class.java, AvroSchemasProvider().testUnionRecord()), + Arguments.of("/schemas/avro/union_and_fixed_fields.avsc", AvroSchema::class.java, AvroSchemasProvider().unionAndFixedFields()), ) } diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/ApplicationEvent.avsc b/asyncapi-core/src/test/resources/schemas/avro/ApplicationEvent.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/ApplicationEvent.avsc rename to asyncapi-core/src/test/resources/schemas/avro/ApplicationEvent.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/DocumentInfo.avsc b/asyncapi-core/src/test/resources/schemas/avro/DocumentInfo.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/DocumentInfo.avsc rename to asyncapi-core/src/test/resources/schemas/avro/DocumentInfo.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/MyResponse.avsc b/asyncapi-core/src/test/resources/schemas/avro/MyResponse.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/MyResponse.avsc rename to asyncapi-core/src/test/resources/schemas/avro/MyResponse.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/SchemaBuilder.avsc b/asyncapi-core/src/test/resources/schemas/avro/SchemaBuilder.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/SchemaBuilder.avsc rename to asyncapi-core/src/test/resources/schemas/avro/SchemaBuilder.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/TestRecordWithLogicalTypes.avsc b/asyncapi-core/src/test/resources/schemas/avro/TestRecordWithLogicalTypes.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/TestRecordWithLogicalTypes.avsc rename to asyncapi-core/src/test/resources/schemas/avro/TestRecordWithLogicalTypes.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/TestRecordWithMapsAndArrays.avsc b/asyncapi-core/src/test/resources/schemas/avro/TestRecordWithMapsAndArrays.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/TestRecordWithMapsAndArrays.avsc rename to asyncapi-core/src/test/resources/schemas/avro/TestRecordWithMapsAndArrays.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/TestUnionRecord.avsc b/asyncapi-core/src/test/resources/schemas/avro/TestUnionRecord.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/TestUnionRecord.avsc rename to asyncapi-core/src/test/resources/schemas/avro/TestUnionRecord.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/foo.Bar.avsc b/asyncapi-core/src/test/resources/schemas/avro/foo.Bar.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/foo.Bar.avsc rename to asyncapi-core/src/test/resources/schemas/avro/foo.Bar.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/full_record_v1.avsc b/asyncapi-core/src/test/resources/schemas/avro/full_record_v1.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/full_record_v1.avsc rename to asyncapi-core/src/test/resources/schemas/avro/full_record_v1.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/full_record_v2.avsc b/asyncapi-core/src/test/resources/schemas/avro/full_record_v2.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/full_record_v2.avsc rename to asyncapi-core/src/test/resources/schemas/avro/full_record_v2.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/logical-uuid.avsc b/asyncapi-core/src/test/resources/schemas/avro/logical-uuid.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/logical-uuid.avsc rename to asyncapi-core/src/test/resources/schemas/avro/logical-uuid.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/logical_types_with_multiple_fields.avsc b/asyncapi-core/src/test/resources/schemas/avro/logical_types_with_multiple_fields.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/logical_types_with_multiple_fields.avsc rename to asyncapi-core/src/test/resources/schemas/avro/logical_types_with_multiple_fields.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/regression_error_field_in_record.avsc b/asyncapi-core/src/test/resources/schemas/avro/regression_error_field_in_record.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/regression_error_field_in_record.avsc rename to asyncapi-core/src/test/resources/schemas/avro/regression_error_field_in_record.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/avro/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/avro/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/avro/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/avro/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/schema-location.json b/asyncapi-core/src/test/resources/schemas/avro/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/schema-location.json rename to asyncapi-core/src/test/resources/schemas/avro/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/simple_record.avsc b/asyncapi-core/src/test/resources/schemas/avro/simple_record.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/simple_record.avsc rename to asyncapi-core/src/test/resources/schemas/avro/simple_record.avsc diff --git a/asyncapi-core/src/test/resources/json/v3/schema/avro/union_and_fixed_fields.avsc b/asyncapi-core/src/test/resources/schemas/avro/union_and_fixed_fields.avsc similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/avro/union_and_fixed_fields.avsc rename to asyncapi-core/src/test/resources/schemas/avro/union_and_fixed_fields.avsc From bcd490830c58f68f543fbdcde745eedffe41f549 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 8 May 2024 02:12:42 +0400 Subject: [PATCH 093/141] tests(schemas): move OpenAPI test resources --- .../openapi/v3/_0_0/OpenAPISchemaTest.kt | 24 +++++++++---------- .../openapi/discriminator-propertyname.json | 0 .../openapi/discriminator.json | 0 .../openapi/externaldocumentation-url.json | 0 .../openapi/externaldocumentation.json | 0 .../openapi/properties/array.json | 0 .../openapi/properties/null.json | 0 .../v3/schema => schemas}/openapi/schema.json | 0 .../openapi/xml-attribute.json | 0 .../openapi/xml-name-replacement.json | 0 .../openapi/xml-prefix-and-namespace.json | 0 .../openapi/xml-wrapped.json | 0 .../v3/schema => schemas}/openapi/xml.json | 0 13 files changed, 12 insertions(+), 12 deletions(-) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/discriminator-propertyname.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/discriminator.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/externaldocumentation-url.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/externaldocumentation.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/properties/array.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/properties/null.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/xml-attribute.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/xml-name-replacement.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/xml-prefix-and-namespace.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/xml-wrapped.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/openapi/xml.json (100%) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt index 6610b7fd..15dcb4c0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchemaTest.kt @@ -84,14 +84,14 @@ class OpenAPISchemaTest { extendedXML.extensions = mapOf(Pair("x-extension-property", "value")) return Stream.of( - Arguments.of("/json/v3/schema/openapi/xml.json", extendedXML), - Arguments.of("/json/v3/schema/openapi/xml-attribute.json", XML.builder().attribute(true).build()), - Arguments.of("/json/v3/schema/openapi/xml-name-replacement.json", XML.builder().name("animal").build()), - Arguments.of("/json/v3/schema/openapi/xml-prefix-and-namespace.json", XML.builder() + Arguments.of("/schemas/openapi/xml.json", extendedXML), + Arguments.of("/schemas/openapi/xml-attribute.json", XML.builder().attribute(true).build()), + Arguments.of("/schemas/openapi/xml-name-replacement.json", XML.builder().name("animal").build()), + Arguments.of("/schemas/openapi/xml-prefix-and-namespace.json", XML.builder() .namespace("http://example.com/schema/sample") .prefix("sample").build() ), - Arguments.of("/json/v3/schema/openapi/xml-wrapped.json", XML.builder().wrapped(true).build()), + Arguments.of("/schemas/openapi/xml-wrapped.json", XML.builder().wrapped(true).build()), ) } @@ -101,14 +101,14 @@ class OpenAPISchemaTest { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/openapi/discriminator.json", Discriminator.builder() + Arguments.of("/schemas/openapi/discriminator.json", Discriminator.builder() .propertyName("pet_type") .mapping(mapOf( Pair("dog", "#/components/schemas/Dog"), Pair("monster", "https://gigantic-server.com/schemas/Monster/schema.json"), )).build() ), - Arguments.of("/json/v3/schema/openapi/discriminator-propertyname.json", Discriminator.builder().propertyName("pet_type").build()), + Arguments.of("/schemas/openapi/discriminator-propertyname.json", Discriminator.builder().propertyName("pet_type").build()), ) } @@ -121,8 +121,8 @@ class OpenAPISchemaTest { extendedExternalDocumentation.extensions = mapOf(Pair("x-extension-property", "value")) return Stream.of( - Arguments.of("/json/v3/schema/openapi/externaldocumentation.json", extendedExternalDocumentation), - Arguments.of("/json/v3/schema/openapi/externaldocumentation-url.json", ExternalDocumentation( + Arguments.of("/schemas/openapi/externaldocumentation.json", extendedExternalDocumentation), + Arguments.of("/schemas/openapi/externaldocumentation-url.json", ExternalDocumentation( null, "https://example.com" )), ) @@ -134,9 +134,9 @@ class OpenAPISchemaTest { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/openapi/schema.json", SchemaTest()), - Arguments.of("/json/v3/schema/openapi/properties/array.json", ExampleEnumDefaultArrayTest()), - Arguments.of("/json/v3/schema/openapi/properties/null.json", ExampleEnumDefaultNullTest()), + Arguments.of("/schemas/openapi/schema.json", SchemaTest()), + Arguments.of("/schemas/openapi/properties/array.json", ExampleEnumDefaultArrayTest()), + Arguments.of("/schemas/openapi/properties/null.json", ExampleEnumDefaultNullTest()), ) } diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/discriminator-propertyname.json b/asyncapi-core/src/test/resources/schemas/openapi/discriminator-propertyname.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/discriminator-propertyname.json rename to asyncapi-core/src/test/resources/schemas/openapi/discriminator-propertyname.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/discriminator.json b/asyncapi-core/src/test/resources/schemas/openapi/discriminator.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/discriminator.json rename to asyncapi-core/src/test/resources/schemas/openapi/discriminator.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/externaldocumentation-url.json b/asyncapi-core/src/test/resources/schemas/openapi/externaldocumentation-url.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/externaldocumentation-url.json rename to asyncapi-core/src/test/resources/schemas/openapi/externaldocumentation-url.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/externaldocumentation.json b/asyncapi-core/src/test/resources/schemas/openapi/externaldocumentation.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/externaldocumentation.json rename to asyncapi-core/src/test/resources/schemas/openapi/externaldocumentation.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/properties/array.json b/asyncapi-core/src/test/resources/schemas/openapi/properties/array.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/properties/array.json rename to asyncapi-core/src/test/resources/schemas/openapi/properties/array.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/properties/null.json b/asyncapi-core/src/test/resources/schemas/openapi/properties/null.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/properties/null.json rename to asyncapi-core/src/test/resources/schemas/openapi/properties/null.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/schema.json b/asyncapi-core/src/test/resources/schemas/openapi/schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/schema.json rename to asyncapi-core/src/test/resources/schemas/openapi/schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/xml-attribute.json b/asyncapi-core/src/test/resources/schemas/openapi/xml-attribute.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/xml-attribute.json rename to asyncapi-core/src/test/resources/schemas/openapi/xml-attribute.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/xml-name-replacement.json b/asyncapi-core/src/test/resources/schemas/openapi/xml-name-replacement.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/xml-name-replacement.json rename to asyncapi-core/src/test/resources/schemas/openapi/xml-name-replacement.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/xml-prefix-and-namespace.json b/asyncapi-core/src/test/resources/schemas/openapi/xml-prefix-and-namespace.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/xml-prefix-and-namespace.json rename to asyncapi-core/src/test/resources/schemas/openapi/xml-prefix-and-namespace.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/xml-wrapped.json b/asyncapi-core/src/test/resources/schemas/openapi/xml-wrapped.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/xml-wrapped.json rename to asyncapi-core/src/test/resources/schemas/openapi/xml-wrapped.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/openapi/xml.json b/asyncapi-core/src/test/resources/schemas/openapi/xml.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/openapi/xml.json rename to asyncapi-core/src/test/resources/schemas/openapi/xml.json From 807fe80ba0ab21caf2fd2ebd96c4cd461baf9fd2 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 8 May 2024 02:23:22 +0400 Subject: [PATCH 094/141] tests(schemas): move Multi Format Schema test resources --- .../AsyncAPIFormatSchemaV2_0_0Test.kt | 56 +++---- .../AsyncAPIFormatSchemaV2_1_0Test.kt | 56 +++---- .../AsyncAPIFormatSchemaV2_2_0Test.kt | 56 +++---- .../AsyncAPIFormatSchemaV2_3_0Test.kt | 56 +++---- .../AsyncAPIFormatSchemaV2_4_0Test.kt | 56 +++---- .../AsyncAPIFormatSchemaV2_5_0Test.kt | 56 +++---- .../AsyncAPIFormatSchemaV2_6_0Test.kt | 56 +++---- .../AsyncAPIFormatSchemaV3_0_0Test.kt | 56 +++---- .../asyncapi/EmptySchemaFormatTest.kt | 28 ++-- .../asyncapi/NullSchemaFormatTest.kt | 28 ++-- .../asyncapi/WithoutSchemaFormatTest.kt | 28 ++-- .../avro/AvroSchemaFormatSchemaV1_10_0Test.kt | 144 +++++++++--------- .../avro/AvroSchemaFormatSchemaV1_10_1Test.kt | 144 +++++++++--------- .../avro/AvroSchemaFormatSchemaV1_10_2Test.kt | 144 +++++++++--------- .../avro/AvroSchemaFormatSchemaV1_11_0Test.kt | 144 +++++++++--------- .../avro/AvroSchemaFormatSchemaV1_11_1Test.kt | 144 +++++++++--------- .../avro/AvroSchemaFormatSchemaV1_9_0Test.kt | 144 +++++++++--------- .../avro/AvroSchemaFormatSchemaV1_9_1Test.kt | 144 +++++++++--------- .../avro/AvroSchemaFormatSchemaV1_9_2Test.kt | 144 +++++++++--------- .../multiformat/json/JsonFormatSchemaTest.kt | 28 ++-- .../openapi/OpenAPIFormatSchemaV3_0_0Test.kt | 8 +- .../openapi/OpenAPIFormatSchemaV3_0_1Test.kt | 8 +- .../openapi/OpenAPIFormatSchemaV3_0_2Test.kt | 8 +- .../openapi/OpenAPIFormatSchemaV3_0_3Test.kt | 8 +- .../vnd.aai.asyncapi+json/arrays.schema.json | 0 .../complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../enumerated-values.schema.json | 0 .../vnd.aai.asyncapi+json/person.schema.json | 0 .../regex-pattern.schema.json | 0 .../vnd.aai.asyncapi+yaml/arrays.schema.yaml | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.yaml | 0 .../vnd.aai.asyncapi+yaml/person.schema.yaml | 0 .../regex-pattern.schema.yaml | 0 .../2.0.0/vnd.aai.asyncapi/arrays.schema.json | 0 .../2.0.0/vnd.aai.asyncapi/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../2.0.0/vnd.aai.asyncapi/person.schema.json | 0 .../2.0.0/vnd.aai.asyncapi/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../vnd.aai.asyncapi+json/arrays.schema.json | 0 .../complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../enumerated-values.schema.json | 0 .../vnd.aai.asyncapi+json/person.schema.json | 0 .../regex-pattern.schema.json | 0 .../vnd.aai.asyncapi+yaml/arrays.schema.yaml | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.yaml | 0 .../vnd.aai.asyncapi+yaml/person.schema.yaml | 0 .../regex-pattern.schema.yaml | 0 .../2.1.0/vnd.aai.asyncapi/arrays.schema.json | 0 .../2.1.0/vnd.aai.asyncapi/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../2.1.0/vnd.aai.asyncapi/person.schema.json | 0 .../2.1.0/vnd.aai.asyncapi/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../vnd.aai.asyncapi+json/arrays.schema.json | 0 .../complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../enumerated-values.schema.json | 0 .../vnd.aai.asyncapi+json/person.schema.json | 0 .../regex-pattern.schema.json | 0 .../vnd.aai.asyncapi+yaml/arrays.schema.yaml | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.yaml | 0 .../vnd.aai.asyncapi+yaml/person.schema.yaml | 0 .../regex-pattern.schema.yaml | 0 .../2.2.0/vnd.aai.asyncapi/arrays.schema.json | 0 .../2.2.0/vnd.aai.asyncapi/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../2.2.0/vnd.aai.asyncapi/person.schema.json | 0 .../2.2.0/vnd.aai.asyncapi/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../vnd.aai.asyncapi+json/arrays.schema.json | 0 .../complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../enumerated-values.schema.json | 0 .../vnd.aai.asyncapi+json/person.schema.json | 0 .../regex-pattern.schema.json | 0 .../vnd.aai.asyncapi+yaml/arrays.schema.yaml | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.yaml | 0 .../vnd.aai.asyncapi+yaml/person.schema.yaml | 0 .../regex-pattern.schema.yaml | 0 .../2.3.0/vnd.aai.asyncapi/arrays.schema.json | 0 .../2.3.0/vnd.aai.asyncapi/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../2.3.0/vnd.aai.asyncapi/person.schema.json | 0 .../2.3.0/vnd.aai.asyncapi/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../vnd.aai.asyncapi+json/arrays.schema.json | 0 .../complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../enumerated-values.schema.json | 0 .../vnd.aai.asyncapi+json/person.schema.json | 0 .../regex-pattern.schema.json | 0 .../vnd.aai.asyncapi+yaml/arrays.schema.yaml | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.yaml | 0 .../vnd.aai.asyncapi+yaml/person.schema.yaml | 0 .../regex-pattern.schema.yaml | 0 .../2.4.0/vnd.aai.asyncapi/arrays.schema.json | 0 .../2.4.0/vnd.aai.asyncapi/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../2.4.0/vnd.aai.asyncapi/person.schema.json | 0 .../2.4.0/vnd.aai.asyncapi/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../vnd.aai.asyncapi+json/arrays.schema.json | 0 .../complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../enumerated-values.schema.json | 0 .../vnd.aai.asyncapi+json/person.schema.json | 0 .../regex-pattern.schema.json | 0 .../vnd.aai.asyncapi+yaml/arrays.schema.yaml | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.yaml | 0 .../vnd.aai.asyncapi+yaml/person.schema.yaml | 0 .../regex-pattern.schema.yaml | 0 .../2.5.0/vnd.aai.asyncapi/arrays.schema.json | 0 .../2.5.0/vnd.aai.asyncapi/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../2.5.0/vnd.aai.asyncapi/person.schema.json | 0 .../2.5.0/vnd.aai.asyncapi/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../vnd.aai.asyncapi+json/arrays.schema.json | 0 .../complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../enumerated-values.schema.json | 0 .../vnd.aai.asyncapi+json/person.schema.json | 0 .../regex-pattern.schema.json | 0 .../vnd.aai.asyncapi+yaml/arrays.schema.yaml | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.yaml | 0 .../vnd.aai.asyncapi+yaml/person.schema.yaml | 0 .../regex-pattern.schema.yaml | 0 .../2.6.0/vnd.aai.asyncapi/arrays.schema.json | 0 .../2.6.0/vnd.aai.asyncapi/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../2.6.0/vnd.aai.asyncapi/person.schema.json | 0 .../2.6.0/vnd.aai.asyncapi/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../vnd.aai.asyncapi+json/arrays.schema.json | 0 .../complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../enumerated-values.schema.json | 0 .../vnd.aai.asyncapi+json/person.schema.json | 0 .../regex-pattern.schema.json | 0 .../vnd.aai.asyncapi+yaml/arrays.schema.yaml | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.yaml | 0 .../vnd.aai.asyncapi+yaml/person.schema.yaml | 0 .../regex-pattern.schema.yaml | 0 .../3.0.0/vnd.aai.asyncapi/arrays.schema.json | 0 .../3.0.0/vnd.aai.asyncapi/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../3.0.0/vnd.aai.asyncapi/person.schema.json | 0 .../3.0.0/vnd.aai.asyncapi/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../ApplicationEvent.json | 0 .../vnd.apache.avro+json/DocumentInfo.json | 0 .../vnd.apache.avro+json/MyResponse.json | 0 .../vnd.apache.avro+json/SchemaBuilder.json | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithMapsAndArrays.json | 0 .../vnd.apache.avro+json/TestUnionRecord.json | 0 .../1.10.0/vnd.apache.avro+json/foo.Bar.json | 0 .../vnd.apache.avro+json/full_record_v1.json | 0 .../vnd.apache.avro+json/full_record_v2.json | 0 .../vnd.apache.avro+json/logical-uuid.json | 0 .../logical_types_with_multiple_fields.json | 0 .../regression_error_field_in_record.json | 0 .../schema-location-read.json | 0 .../schema-location-write.json | 0 .../vnd.apache.avro+json/schema-location.json | 0 .../vnd.apache.avro+json/simple_record.json | 0 .../union_and_fixed_fields.json | 0 .../ApplicationEvent.yaml | 0 .../vnd.apache.avro+yaml/DocumentInfo.yaml | 0 .../vnd.apache.avro+yaml/MyResponse.yaml | 0 .../vnd.apache.avro+yaml/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro+yaml/TestUnionRecord.yaml | 0 .../1.10.0/vnd.apache.avro+yaml/foo.Bar.yaml | 0 .../vnd.apache.avro+yaml/full_record_v1.yaml | 0 .../vnd.apache.avro+yaml/full_record_v2.yaml | 0 .../vnd.apache.avro+yaml/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.yaml | 0 .../schema-location-read.yaml | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro+yaml/schema-location.yaml | 0 .../vnd.apache.avro+yaml/simple_record.yaml | 0 .../union_and_fixed_fields.yaml | 0 .../vnd.apache.avro/ApplicationEvent.json | 0 .../vnd.apache.avro/ApplicationEvent.yaml | 0 .../1.10.0/vnd.apache.avro/DocumentInfo.json | 0 .../1.10.0/vnd.apache.avro/DocumentInfo.yaml | 0 .../1.10.0/vnd.apache.avro/MyResponse.json | 0 .../1.10.0/vnd.apache.avro/MyResponse.yaml | 0 .../1.10.0/vnd.apache.avro/SchemaBuilder.json | 0 .../1.10.0/vnd.apache.avro/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.json | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro/TestUnionRecord.json | 0 .../vnd.apache.avro/TestUnionRecord.yaml | 0 .../avro/1.10.0/vnd.apache.avro/foo.Bar.json | 0 .../avro/1.10.0/vnd.apache.avro/foo.Bar.yaml | 0 .../vnd.apache.avro/full_record_v1.json | 0 .../vnd.apache.avro/full_record_v1.yaml | 0 .../vnd.apache.avro/full_record_v2.json | 0 .../vnd.apache.avro/full_record_v2.yaml | 0 .../1.10.0/vnd.apache.avro/logical-uuid.json | 0 .../1.10.0/vnd.apache.avro/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.json | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.json | 0 .../regression_error_field_in_record.yaml | 0 .../vnd.apache.avro/schema-location-read.json | 0 .../vnd.apache.avro/schema-location-read.yaml | 0 .../schema-location-write.json | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro/schema-location.json | 0 .../vnd.apache.avro/schema-location.yaml | 0 .../1.10.0/vnd.apache.avro/simple_record.json | 0 .../1.10.0/vnd.apache.avro/simple_record.yaml | 0 .../union_and_fixed_fields.json | 0 .../union_and_fixed_fields.yaml | 0 .../ApplicationEvent.json | 0 .../vnd.apache.avro+json/DocumentInfo.json | 0 .../vnd.apache.avro+json/MyResponse.json | 0 .../vnd.apache.avro+json/SchemaBuilder.json | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithMapsAndArrays.json | 0 .../vnd.apache.avro+json/TestUnionRecord.json | 0 .../1.10.1/vnd.apache.avro+json/foo.Bar.json | 0 .../vnd.apache.avro+json/full_record_v1.json | 0 .../vnd.apache.avro+json/full_record_v2.json | 0 .../vnd.apache.avro+json/logical-uuid.json | 0 .../logical_types_with_multiple_fields.json | 0 .../regression_error_field_in_record.json | 0 .../schema-location-read.json | 0 .../schema-location-write.json | 0 .../vnd.apache.avro+json/schema-location.json | 0 .../vnd.apache.avro+json/simple_record.json | 0 .../union_and_fixed_fields.json | 0 .../ApplicationEvent.yaml | 0 .../vnd.apache.avro+yaml/DocumentInfo.yaml | 0 .../vnd.apache.avro+yaml/MyResponse.yaml | 0 .../vnd.apache.avro+yaml/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro+yaml/TestUnionRecord.yaml | 0 .../1.10.1/vnd.apache.avro+yaml/foo.Bar.yaml | 0 .../vnd.apache.avro+yaml/full_record_v1.yaml | 0 .../vnd.apache.avro+yaml/full_record_v2.yaml | 0 .../vnd.apache.avro+yaml/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.yaml | 0 .../schema-location-read.yaml | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro+yaml/schema-location.yaml | 0 .../vnd.apache.avro+yaml/simple_record.yaml | 0 .../union_and_fixed_fields.yaml | 0 .../vnd.apache.avro/ApplicationEvent.json | 0 .../vnd.apache.avro/ApplicationEvent.yaml | 0 .../1.10.1/vnd.apache.avro/DocumentInfo.json | 0 .../1.10.1/vnd.apache.avro/DocumentInfo.yaml | 0 .../1.10.1/vnd.apache.avro/MyResponse.json | 0 .../1.10.1/vnd.apache.avro/MyResponse.yaml | 0 .../1.10.1/vnd.apache.avro/SchemaBuilder.json | 0 .../1.10.1/vnd.apache.avro/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.json | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro/TestUnionRecord.json | 0 .../vnd.apache.avro/TestUnionRecord.yaml | 0 .../avro/1.10.1/vnd.apache.avro/foo.Bar.json | 0 .../avro/1.10.1/vnd.apache.avro/foo.Bar.yaml | 0 .../vnd.apache.avro/full_record_v1.json | 0 .../vnd.apache.avro/full_record_v1.yaml | 0 .../vnd.apache.avro/full_record_v2.json | 0 .../vnd.apache.avro/full_record_v2.yaml | 0 .../1.10.1/vnd.apache.avro/logical-uuid.json | 0 .../1.10.1/vnd.apache.avro/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.json | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.json | 0 .../regression_error_field_in_record.yaml | 0 .../vnd.apache.avro/schema-location-read.json | 0 .../vnd.apache.avro/schema-location-read.yaml | 0 .../schema-location-write.json | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro/schema-location.json | 0 .../vnd.apache.avro/schema-location.yaml | 0 .../1.10.1/vnd.apache.avro/simple_record.json | 0 .../1.10.1/vnd.apache.avro/simple_record.yaml | 0 .../union_and_fixed_fields.json | 0 .../union_and_fixed_fields.yaml | 0 .../ApplicationEvent.json | 0 .../vnd.apache.avro+json/DocumentInfo.json | 0 .../vnd.apache.avro+json/MyResponse.json | 0 .../vnd.apache.avro+json/SchemaBuilder.json | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithMapsAndArrays.json | 0 .../vnd.apache.avro+json/TestUnionRecord.json | 0 .../1.10.2/vnd.apache.avro+json/foo.Bar.json | 0 .../vnd.apache.avro+json/full_record_v1.json | 0 .../vnd.apache.avro+json/full_record_v2.json | 0 .../vnd.apache.avro+json/logical-uuid.json | 0 .../logical_types_with_multiple_fields.json | 0 .../regression_error_field_in_record.json | 0 .../schema-location-read.json | 0 .../schema-location-write.json | 0 .../vnd.apache.avro+json/schema-location.json | 0 .../vnd.apache.avro+json/simple_record.json | 0 .../union_and_fixed_fields.json | 0 .../ApplicationEvent.yaml | 0 .../vnd.apache.avro+yaml/DocumentInfo.yaml | 0 .../vnd.apache.avro+yaml/MyResponse.yaml | 0 .../vnd.apache.avro+yaml/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro+yaml/TestUnionRecord.yaml | 0 .../1.10.2/vnd.apache.avro+yaml/foo.Bar.yaml | 0 .../vnd.apache.avro+yaml/full_record_v1.yaml | 0 .../vnd.apache.avro+yaml/full_record_v2.yaml | 0 .../vnd.apache.avro+yaml/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.yaml | 0 .../schema-location-read.yaml | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro+yaml/schema-location.yaml | 0 .../vnd.apache.avro+yaml/simple_record.yaml | 0 .../union_and_fixed_fields.yaml | 0 .../vnd.apache.avro/ApplicationEvent.json | 0 .../vnd.apache.avro/ApplicationEvent.yaml | 0 .../1.10.2/vnd.apache.avro/DocumentInfo.json | 0 .../1.10.2/vnd.apache.avro/DocumentInfo.yaml | 0 .../1.10.2/vnd.apache.avro/MyResponse.json | 0 .../1.10.2/vnd.apache.avro/MyResponse.yaml | 0 .../1.10.2/vnd.apache.avro/SchemaBuilder.json | 0 .../1.10.2/vnd.apache.avro/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.json | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro/TestUnionRecord.json | 0 .../vnd.apache.avro/TestUnionRecord.yaml | 0 .../avro/1.10.2/vnd.apache.avro/foo.Bar.json | 0 .../avro/1.10.2/vnd.apache.avro/foo.Bar.yaml | 0 .../vnd.apache.avro/full_record_v1.json | 0 .../vnd.apache.avro/full_record_v1.yaml | 0 .../vnd.apache.avro/full_record_v2.json | 0 .../vnd.apache.avro/full_record_v2.yaml | 0 .../1.10.2/vnd.apache.avro/logical-uuid.json | 0 .../1.10.2/vnd.apache.avro/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.json | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.json | 0 .../regression_error_field_in_record.yaml | 0 .../vnd.apache.avro/schema-location-read.json | 0 .../vnd.apache.avro/schema-location-read.yaml | 0 .../schema-location-write.json | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro/schema-location.json | 0 .../vnd.apache.avro/schema-location.yaml | 0 .../1.10.2/vnd.apache.avro/simple_record.json | 0 .../1.10.2/vnd.apache.avro/simple_record.yaml | 0 .../union_and_fixed_fields.json | 0 .../union_and_fixed_fields.yaml | 0 .../ApplicationEvent.json | 0 .../vnd.apache.avro+json/DocumentInfo.json | 0 .../vnd.apache.avro+json/MyResponse.json | 0 .../vnd.apache.avro+json/SchemaBuilder.json | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithMapsAndArrays.json | 0 .../vnd.apache.avro+json/TestUnionRecord.json | 0 .../1.11.0/vnd.apache.avro+json/foo.Bar.json | 0 .../vnd.apache.avro+json/full_record_v1.json | 0 .../vnd.apache.avro+json/full_record_v2.json | 0 .../vnd.apache.avro+json/logical-uuid.json | 0 .../logical_types_with_multiple_fields.json | 0 .../regression_error_field_in_record.json | 0 .../schema-location-read.json | 0 .../schema-location-write.json | 0 .../vnd.apache.avro+json/schema-location.json | 0 .../vnd.apache.avro+json/simple_record.json | 0 .../union_and_fixed_fields.json | 0 .../ApplicationEvent.yaml | 0 .../vnd.apache.avro+yaml/DocumentInfo.yaml | 0 .../vnd.apache.avro+yaml/MyResponse.yaml | 0 .../vnd.apache.avro+yaml/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro+yaml/TestUnionRecord.yaml | 0 .../1.11.0/vnd.apache.avro+yaml/foo.Bar.yaml | 0 .../vnd.apache.avro+yaml/full_record_v1.yaml | 0 .../vnd.apache.avro+yaml/full_record_v2.yaml | 0 .../vnd.apache.avro+yaml/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.yaml | 0 .../schema-location-read.yaml | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro+yaml/schema-location.yaml | 0 .../vnd.apache.avro+yaml/simple_record.yaml | 0 .../union_and_fixed_fields.yaml | 0 .../vnd.apache.avro/ApplicationEvent.json | 0 .../vnd.apache.avro/ApplicationEvent.yaml | 0 .../1.11.0/vnd.apache.avro/DocumentInfo.json | 0 .../1.11.0/vnd.apache.avro/DocumentInfo.yaml | 0 .../1.11.0/vnd.apache.avro/MyResponse.json | 0 .../1.11.0/vnd.apache.avro/MyResponse.yaml | 0 .../1.11.0/vnd.apache.avro/SchemaBuilder.json | 0 .../1.11.0/vnd.apache.avro/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.json | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro/TestUnionRecord.json | 0 .../vnd.apache.avro/TestUnionRecord.yaml | 0 .../avro/1.11.0/vnd.apache.avro/foo.Bar.json | 0 .../avro/1.11.0/vnd.apache.avro/foo.Bar.yaml | 0 .../vnd.apache.avro/full_record_v1.json | 0 .../vnd.apache.avro/full_record_v1.yaml | 0 .../vnd.apache.avro/full_record_v2.json | 0 .../vnd.apache.avro/full_record_v2.yaml | 0 .../1.11.0/vnd.apache.avro/logical-uuid.json | 0 .../1.11.0/vnd.apache.avro/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.json | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.json | 0 .../regression_error_field_in_record.yaml | 0 .../vnd.apache.avro/schema-location-read.json | 0 .../vnd.apache.avro/schema-location-read.yaml | 0 .../schema-location-write.json | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro/schema-location.json | 0 .../vnd.apache.avro/schema-location.yaml | 0 .../1.11.0/vnd.apache.avro/simple_record.json | 0 .../1.11.0/vnd.apache.avro/simple_record.yaml | 0 .../union_and_fixed_fields.json | 0 .../union_and_fixed_fields.yaml | 0 .../ApplicationEvent.json | 0 .../vnd.apache.avro+json/DocumentInfo.json | 0 .../vnd.apache.avro+json/MyResponse.json | 0 .../vnd.apache.avro+json/SchemaBuilder.json | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithMapsAndArrays.json | 0 .../vnd.apache.avro+json/TestUnionRecord.json | 0 .../1.11.1/vnd.apache.avro+json/foo.Bar.json | 0 .../vnd.apache.avro+json/full_record_v1.json | 0 .../vnd.apache.avro+json/full_record_v2.json | 0 .../vnd.apache.avro+json/logical-uuid.json | 0 .../logical_types_with_multiple_fields.json | 0 .../regression_error_field_in_record.json | 0 .../schema-location-read.json | 0 .../schema-location-write.json | 0 .../vnd.apache.avro+json/schema-location.json | 0 .../vnd.apache.avro+json/simple_record.json | 0 .../union_and_fixed_fields.json | 0 .../ApplicationEvent.yaml | 0 .../vnd.apache.avro+yaml/DocumentInfo.yaml | 0 .../vnd.apache.avro+yaml/MyResponse.yaml | 0 .../vnd.apache.avro+yaml/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro+yaml/TestUnionRecord.yaml | 0 .../1.11.1/vnd.apache.avro+yaml/foo.Bar.yaml | 0 .../vnd.apache.avro+yaml/full_record_v1.yaml | 0 .../vnd.apache.avro+yaml/full_record_v2.yaml | 0 .../vnd.apache.avro+yaml/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.yaml | 0 .../schema-location-read.yaml | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro+yaml/schema-location.yaml | 0 .../vnd.apache.avro+yaml/simple_record.yaml | 0 .../union_and_fixed_fields.yaml | 0 .../vnd.apache.avro/ApplicationEvent.json | 0 .../vnd.apache.avro/ApplicationEvent.yaml | 0 .../1.11.1/vnd.apache.avro/DocumentInfo.json | 0 .../1.11.1/vnd.apache.avro/DocumentInfo.yaml | 0 .../1.11.1/vnd.apache.avro/MyResponse.json | 0 .../1.11.1/vnd.apache.avro/MyResponse.yaml | 0 .../1.11.1/vnd.apache.avro/SchemaBuilder.json | 0 .../1.11.1/vnd.apache.avro/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.json | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro/TestUnionRecord.json | 0 .../vnd.apache.avro/TestUnionRecord.yaml | 0 .../avro/1.11.1/vnd.apache.avro/foo.Bar.json | 0 .../avro/1.11.1/vnd.apache.avro/foo.Bar.yaml | 0 .../vnd.apache.avro/full_record_v1.json | 0 .../vnd.apache.avro/full_record_v1.yaml | 0 .../vnd.apache.avro/full_record_v2.json | 0 .../vnd.apache.avro/full_record_v2.yaml | 0 .../1.11.1/vnd.apache.avro/logical-uuid.json | 0 .../1.11.1/vnd.apache.avro/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.json | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.json | 0 .../regression_error_field_in_record.yaml | 0 .../vnd.apache.avro/schema-location-read.json | 0 .../vnd.apache.avro/schema-location-read.yaml | 0 .../schema-location-write.json | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro/schema-location.json | 0 .../vnd.apache.avro/schema-location.yaml | 0 .../1.11.1/vnd.apache.avro/simple_record.json | 0 .../1.11.1/vnd.apache.avro/simple_record.yaml | 0 .../union_and_fixed_fields.json | 0 .../union_and_fixed_fields.yaml | 0 .../ApplicationEvent.json | 0 .../vnd.apache.avro+json/DocumentInfo.json | 0 .../vnd.apache.avro+json/MyResponse.json | 0 .../vnd.apache.avro+json/SchemaBuilder.json | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithMapsAndArrays.json | 0 .../vnd.apache.avro+json/TestUnionRecord.json | 0 .../1.9.0/vnd.apache.avro+json/foo.Bar.json | 0 .../vnd.apache.avro+json/full_record_v1.json | 0 .../vnd.apache.avro+json/full_record_v2.json | 0 .../vnd.apache.avro+json/logical-uuid.json | 0 .../logical_types_with_multiple_fields.json | 0 .../regression_error_field_in_record.json | 0 .../schema-location-read.json | 0 .../schema-location-write.json | 0 .../vnd.apache.avro+json/schema-location.json | 0 .../vnd.apache.avro+json/simple_record.json | 0 .../union_and_fixed_fields.json | 0 .../ApplicationEvent.yaml | 0 .../vnd.apache.avro+yaml/DocumentInfo.yaml | 0 .../vnd.apache.avro+yaml/MyResponse.yaml | 0 .../vnd.apache.avro+yaml/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro+yaml/TestUnionRecord.yaml | 0 .../1.9.0/vnd.apache.avro+yaml/foo.Bar.yaml | 0 .../vnd.apache.avro+yaml/full_record_v1.yaml | 0 .../vnd.apache.avro+yaml/full_record_v2.yaml | 0 .../vnd.apache.avro+yaml/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.yaml | 0 .../schema-location-read.yaml | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro+yaml/schema-location.yaml | 0 .../vnd.apache.avro+yaml/simple_record.yaml | 0 .../union_and_fixed_fields.yaml | 0 .../vnd.apache.avro/ApplicationEvent.json | 0 .../vnd.apache.avro/ApplicationEvent.yaml | 0 .../1.9.0/vnd.apache.avro/DocumentInfo.json | 0 .../1.9.0/vnd.apache.avro/DocumentInfo.yaml | 0 .../1.9.0/vnd.apache.avro/MyResponse.json | 0 .../1.9.0/vnd.apache.avro/MyResponse.yaml | 0 .../1.9.0/vnd.apache.avro/SchemaBuilder.json | 0 .../1.9.0/vnd.apache.avro/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.json | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro/TestUnionRecord.json | 0 .../vnd.apache.avro/TestUnionRecord.yaml | 0 .../avro/1.9.0/vnd.apache.avro/foo.Bar.json | 0 .../avro/1.9.0/vnd.apache.avro/foo.Bar.yaml | 0 .../1.9.0/vnd.apache.avro/full_record_v1.json | 0 .../1.9.0/vnd.apache.avro/full_record_v1.yaml | 0 .../1.9.0/vnd.apache.avro/full_record_v2.json | 0 .../1.9.0/vnd.apache.avro/full_record_v2.yaml | 0 .../1.9.0/vnd.apache.avro/logical-uuid.json | 0 .../1.9.0/vnd.apache.avro/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.json | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.json | 0 .../regression_error_field_in_record.yaml | 0 .../vnd.apache.avro/schema-location-read.json | 0 .../vnd.apache.avro/schema-location-read.yaml | 0 .../schema-location-write.json | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro/schema-location.json | 0 .../vnd.apache.avro/schema-location.yaml | 0 .../1.9.0/vnd.apache.avro/simple_record.json | 0 .../1.9.0/vnd.apache.avro/simple_record.yaml | 0 .../union_and_fixed_fields.json | 0 .../union_and_fixed_fields.yaml | 0 .../ApplicationEvent.json | 0 .../vnd.apache.avro+json/DocumentInfo.json | 0 .../vnd.apache.avro+json/MyResponse.json | 0 .../vnd.apache.avro+json/SchemaBuilder.json | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithMapsAndArrays.json | 0 .../vnd.apache.avro+json/TestUnionRecord.json | 0 .../1.9.1/vnd.apache.avro+json/foo.Bar.json | 0 .../vnd.apache.avro+json/full_record_v1.json | 0 .../vnd.apache.avro+json/full_record_v2.json | 0 .../vnd.apache.avro+json/logical-uuid.json | 0 .../logical_types_with_multiple_fields.json | 0 .../regression_error_field_in_record.json | 0 .../schema-location-read.json | 0 .../schema-location-write.json | 0 .../vnd.apache.avro+json/schema-location.json | 0 .../vnd.apache.avro+json/simple_record.json | 0 .../union_and_fixed_fields.json | 0 .../ApplicationEvent.yaml | 0 .../vnd.apache.avro+yaml/DocumentInfo.yaml | 0 .../vnd.apache.avro+yaml/MyResponse.yaml | 0 .../vnd.apache.avro+yaml/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro+yaml/TestUnionRecord.yaml | 0 .../1.9.1/vnd.apache.avro+yaml/foo.Bar.yaml | 0 .../vnd.apache.avro+yaml/full_record_v1.yaml | 0 .../vnd.apache.avro+yaml/full_record_v2.yaml | 0 .../vnd.apache.avro+yaml/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.yaml | 0 .../schema-location-read.yaml | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro+yaml/schema-location.yaml | 0 .../vnd.apache.avro+yaml/simple_record.yaml | 0 .../union_and_fixed_fields.yaml | 0 .../vnd.apache.avro/ApplicationEvent.json | 0 .../vnd.apache.avro/ApplicationEvent.yaml | 0 .../1.9.1/vnd.apache.avro/DocumentInfo.json | 0 .../1.9.1/vnd.apache.avro/DocumentInfo.yaml | 0 .../1.9.1/vnd.apache.avro/MyResponse.json | 0 .../1.9.1/vnd.apache.avro/MyResponse.yaml | 0 .../1.9.1/vnd.apache.avro/SchemaBuilder.json | 0 .../1.9.1/vnd.apache.avro/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.json | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro/TestUnionRecord.json | 0 .../vnd.apache.avro/TestUnionRecord.yaml | 0 .../avro/1.9.1/vnd.apache.avro/foo.Bar.json | 0 .../avro/1.9.1/vnd.apache.avro/foo.Bar.yaml | 0 .../1.9.1/vnd.apache.avro/full_record_v1.json | 0 .../1.9.1/vnd.apache.avro/full_record_v1.yaml | 0 .../1.9.1/vnd.apache.avro/full_record_v2.json | 0 .../1.9.1/vnd.apache.avro/full_record_v2.yaml | 0 .../1.9.1/vnd.apache.avro/logical-uuid.json | 0 .../1.9.1/vnd.apache.avro/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.json | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.json | 0 .../regression_error_field_in_record.yaml | 0 .../vnd.apache.avro/schema-location-read.json | 0 .../vnd.apache.avro/schema-location-read.yaml | 0 .../schema-location-write.json | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro/schema-location.json | 0 .../vnd.apache.avro/schema-location.yaml | 0 .../1.9.1/vnd.apache.avro/simple_record.json | 0 .../1.9.1/vnd.apache.avro/simple_record.yaml | 0 .../union_and_fixed_fields.json | 0 .../union_and_fixed_fields.yaml | 0 .../ApplicationEvent.json | 0 .../vnd.apache.avro+json/DocumentInfo.json | 0 .../vnd.apache.avro+json/MyResponse.json | 0 .../vnd.apache.avro+json/SchemaBuilder.json | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithMapsAndArrays.json | 0 .../vnd.apache.avro+json/TestUnionRecord.json | 0 .../1.9.2/vnd.apache.avro+json/foo.Bar.json | 0 .../vnd.apache.avro+json/full_record_v1.json | 0 .../vnd.apache.avro+json/full_record_v2.json | 0 .../vnd.apache.avro+json/logical-uuid.json | 0 .../logical_types_with_multiple_fields.json | 0 .../regression_error_field_in_record.json | 0 .../schema-location-read.json | 0 .../schema-location-write.json | 0 .../vnd.apache.avro+json/schema-location.json | 0 .../vnd.apache.avro+json/simple_record.json | 0 .../union_and_fixed_fields.json | 0 .../ApplicationEvent.yaml | 0 .../vnd.apache.avro+yaml/DocumentInfo.yaml | 0 .../vnd.apache.avro+yaml/MyResponse.yaml | 0 .../vnd.apache.avro+yaml/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro+yaml/TestUnionRecord.yaml | 0 .../1.9.2/vnd.apache.avro+yaml/foo.Bar.yaml | 0 .../vnd.apache.avro+yaml/full_record_v1.yaml | 0 .../vnd.apache.avro+yaml/full_record_v2.yaml | 0 .../vnd.apache.avro+yaml/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.yaml | 0 .../schema-location-read.yaml | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro+yaml/schema-location.yaml | 0 .../vnd.apache.avro+yaml/simple_record.yaml | 0 .../union_and_fixed_fields.yaml | 0 .../vnd.apache.avro/ApplicationEvent.json | 0 .../vnd.apache.avro/ApplicationEvent.yaml | 0 .../1.9.2/vnd.apache.avro/DocumentInfo.json | 0 .../1.9.2/vnd.apache.avro/DocumentInfo.yaml | 0 .../1.9.2/vnd.apache.avro/MyResponse.json | 0 .../1.9.2/vnd.apache.avro/MyResponse.yaml | 0 .../1.9.2/vnd.apache.avro/SchemaBuilder.json | 0 .../1.9.2/vnd.apache.avro/SchemaBuilder.yaml | 0 .../TestRecordWithLogicalTypes.json | 0 .../TestRecordWithLogicalTypes.yaml | 0 .../TestRecordWithMapsAndArrays.json | 0 .../TestRecordWithMapsAndArrays.yaml | 0 .../vnd.apache.avro/TestUnionRecord.json | 0 .../vnd.apache.avro/TestUnionRecord.yaml | 0 .../avro/1.9.2/vnd.apache.avro/foo.Bar.json | 0 .../avro/1.9.2/vnd.apache.avro/foo.Bar.yaml | 0 .../1.9.2/vnd.apache.avro/full_record_v1.json | 0 .../1.9.2/vnd.apache.avro/full_record_v1.yaml | 0 .../1.9.2/vnd.apache.avro/full_record_v2.json | 0 .../1.9.2/vnd.apache.avro/full_record_v2.yaml | 0 .../1.9.2/vnd.apache.avro/logical-uuid.json | 0 .../1.9.2/vnd.apache.avro/logical-uuid.yaml | 0 .../logical_types_with_multiple_fields.json | 0 .../logical_types_with_multiple_fields.yaml | 0 .../regression_error_field_in_record.json | 0 .../regression_error_field_in_record.yaml | 0 .../vnd.apache.avro/schema-location-read.json | 0 .../vnd.apache.avro/schema-location-read.yaml | 0 .../schema-location-write.json | 0 .../schema-location-write.yaml | 0 .../vnd.apache.avro/schema-location.json | 0 .../vnd.apache.avro/schema-location.yaml | 0 .../1.9.2/vnd.apache.avro/simple_record.json | 0 .../1.9.2/vnd.apache.avro/simple_record.yaml | 0 .../union_and_fixed_fields.json | 0 .../union_and_fixed_fields.yaml | 0 .../json/schema+json/arrays.schema.json | 0 .../schema+json/complex-object.schema.json | 0 ...conditional-validation-if-else.schema.json | 0 .../draft-07-core-schema-meta-schema.json | 0 .../schema+json/enumerated-values.schema.json | 0 .../json/schema+json/person.schema.json | 0 .../schema+json/regex-pattern.schema.json | 0 .../json/schema+yaml/arrays.schema.yaml | 0 .../schema+yaml/complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../schema+yaml/enumerated-values.schema.yaml | 0 .../json/schema+yaml/person.schema.yaml | 0 .../schema+yaml/regex-pattern.schema.yaml | 0 .../3.0.0/vnd.oai.openapi+json/schema.json | 0 .../3.0.0/vnd.oai.openapi+yaml/schema.yaml | 0 .../openapi/3.0.0/vnd.oai.openapi/schema.json | 0 .../openapi/3.0.0/vnd.oai.openapi/schema.yaml | 0 .../3.0.1/vnd.oai.openapi+json/schema.json | 0 .../3.0.1/vnd.oai.openapi+yaml/schema.yaml | 0 .../openapi/3.0.1/vnd.oai.openapi/schema.json | 0 .../openapi/3.0.1/vnd.oai.openapi/schema.yaml | 0 .../3.0.2/vnd.oai.openapi+json/schema.json | 0 .../3.0.2/vnd.oai.openapi+yaml/schema.yaml | 0 .../openapi/3.0.2/vnd.oai.openapi/schema.json | 0 .../openapi/3.0.2/vnd.oai.openapi/schema.yaml | 0 .../3.0.3/vnd.oai.openapi+json/schema.json | 0 .../3.0.3/vnd.oai.openapi+yaml/schema.yaml | 0 .../openapi/3.0.3/vnd.oai.openapi/schema.json | 0 .../openapi/3.0.3/vnd.oai.openapi/schema.yaml | 0 .../schemaFormat is empty/arrays.schema.json | 0 .../schemaFormat is empty/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../schemaFormat is empty/person.schema.json | 0 .../schemaFormat is empty/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../schemaFormat is null/arrays.schema.json | 0 .../schemaFormat is null/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../schemaFormat is null/person.schema.json | 0 .../schemaFormat is null/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 .../without schemaFormat/arrays.schema.json | 0 .../without schemaFormat/arrays.schema.yaml | 0 .../complex-object.schema.json | 0 .../complex-object.schema.yaml | 0 ...conditional-validation-if-else.schema.json | 0 ...conditional-validation-if-else.schema.yaml | 0 .../draft-07-core-schema-meta-schema.json | 0 .../draft-07-core-schema-meta-schema.yaml | 0 .../enumerated-values.schema.json | 0 .../enumerated-values.schema.yaml | 0 .../without schemaFormat/person.schema.json | 0 .../without schemaFormat/person.schema.yaml | 0 .../regex-pattern.schema.json | 0 .../regex-pattern.schema.yaml | 0 896 files changed, 872 insertions(+), 872 deletions(-) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+json/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+json/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+json/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+json/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+json/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+json/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+json/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+json/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+json/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+json/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+json/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+json/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+json/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+json/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+json/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+yaml/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+yaml/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+yaml/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+yaml/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+yaml/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+yaml/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/json/schema+yaml/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.0/vnd.oai.openapi+json/schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.0/vnd.oai.openapi+yaml/schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.1/vnd.oai.openapi+json/schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.1/vnd.oai.openapi+yaml/schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.2/vnd.oai.openapi+json/schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.2/vnd.oai.openapi+yaml/schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.3/vnd.oai.openapi+json/schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.3/vnd.oai.openapi+yaml/schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is empty/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/schemaFormat is null/regex-pattern.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/arrays.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/arrays.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/complex-object.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/complex-object.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/conditional-validation-if-else.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/conditional-validation-if-else.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/enumerated-values.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/enumerated-values.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/person.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/person.schema.yaml (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/regex-pattern.schema.json (100%) rename asyncapi-core/src/test/resources/{json/v3/schema => schemas}/multiformat/without schemaFormat/regex-pattern.schema.yaml (100%) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt index d416c7e6..dc38ed3f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt @@ -34,49 +34,49 @@ abstract class AsyncAPIFormatSchemaV2_0_0Test: com.asyncapi.schemas.multiformat. override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/person.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.0.0", RegexPatternTest().asyncAPISchema() @@ -84,49 +84,49 @@ abstract class AsyncAPIFormatSchemaV2_0_0Test: com.asyncapi.schemas.multiformat. ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", RegexPatternTest().asyncAPISchema() @@ -142,49 +142,49 @@ abstract class AsyncAPIFormatSchemaV2_0_0Test: com.asyncapi.schemas.multiformat. override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.0.0", RegexPatternTest().asyncAPISchema() @@ -192,49 +192,49 @@ abstract class AsyncAPIFormatSchemaV2_0_0Test: com.asyncapi.schemas.multiformat. ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.0.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt index c1917255..9bc3954d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt @@ -34,49 +34,49 @@ abstract class AsyncAPIFormatSchemaV2_1_0Test: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.1.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.1.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.1.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.1.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.1.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/person.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.1.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.1.0", RegexPatternTest().asyncAPISchema() @@ -84,49 +84,49 @@ abstract class AsyncAPIFormatSchemaV2_1_0Test: AsyncAPIFormatSchemaTest() { ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", RegexPatternTest().asyncAPISchema() @@ -142,49 +142,49 @@ abstract class AsyncAPIFormatSchemaV2_1_0Test: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.1.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.1.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.1.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.1.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.1.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.1.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.1.0", RegexPatternTest().asyncAPISchema() @@ -192,49 +192,49 @@ abstract class AsyncAPIFormatSchemaV2_1_0Test: AsyncAPIFormatSchemaTest() { ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.1.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt index eda590d6..b015757a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt @@ -34,49 +34,49 @@ abstract class AsyncAPIFormatSchemaV2_2_0Test: com.asyncapi.schemas.multiformat. override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.2.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.2.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.2.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.2.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.2.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/person.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.2.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.2.0", RegexPatternTest().asyncAPISchema() @@ -84,49 +84,49 @@ abstract class AsyncAPIFormatSchemaV2_2_0Test: com.asyncapi.schemas.multiformat. ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", RegexPatternTest().asyncAPISchema() @@ -142,49 +142,49 @@ abstract class AsyncAPIFormatSchemaV2_2_0Test: com.asyncapi.schemas.multiformat. override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.2.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.2.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.2.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.2.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.2.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.2.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.2.0", RegexPatternTest().asyncAPISchema() @@ -192,49 +192,49 @@ abstract class AsyncAPIFormatSchemaV2_2_0Test: com.asyncapi.schemas.multiformat. ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.2.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt index a18fd42d..7fb3e307 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt @@ -34,49 +34,49 @@ abstract class AsyncAPIFormatSchemaV2_3_0Test: com.asyncapi.schemas.multiformat. override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.3.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.3.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.3.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.3.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.3.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/person.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.3.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.3.0", RegexPatternTest().asyncAPISchema() @@ -84,49 +84,49 @@ abstract class AsyncAPIFormatSchemaV2_3_0Test: com.asyncapi.schemas.multiformat. ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", RegexPatternTest().asyncAPISchema() @@ -142,49 +142,49 @@ abstract class AsyncAPIFormatSchemaV2_3_0Test: com.asyncapi.schemas.multiformat. override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.3.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.3.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.3.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.3.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.3.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.3.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.3.0", RegexPatternTest().asyncAPISchema() @@ -192,49 +192,49 @@ abstract class AsyncAPIFormatSchemaV2_3_0Test: com.asyncapi.schemas.multiformat. ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.3.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt index 4677c2ad..f0548d6e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt @@ -34,49 +34,49 @@ abstract class AsyncAPIFormatSchemaV2_4_0Test: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.4.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.4.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.4.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.4.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.4.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/person.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.4.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.4.0", RegexPatternTest().asyncAPISchema() @@ -84,49 +84,49 @@ abstract class AsyncAPIFormatSchemaV2_4_0Test: AsyncAPIFormatSchemaTest() { ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", RegexPatternTest().asyncAPISchema() @@ -142,49 +142,49 @@ abstract class AsyncAPIFormatSchemaV2_4_0Test: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.4.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.4.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.4.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.4.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.4.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.4.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.4.0", RegexPatternTest().asyncAPISchema() @@ -192,49 +192,49 @@ abstract class AsyncAPIFormatSchemaV2_4_0Test: AsyncAPIFormatSchemaTest() { ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.4.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt index 9b6d8bcf..792fe8bb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt @@ -34,49 +34,49 @@ abstract class AsyncAPIFormatSchemaV2_5_0Test: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.5.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.5.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.5.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.5.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.5.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/person.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.5.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.5.0", RegexPatternTest().asyncAPISchema() @@ -84,49 +84,49 @@ abstract class AsyncAPIFormatSchemaV2_5_0Test: AsyncAPIFormatSchemaTest() { ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", RegexPatternTest().asyncAPISchema() @@ -142,49 +142,49 @@ abstract class AsyncAPIFormatSchemaV2_5_0Test: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.5.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.5.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.5.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.5.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.5.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.5.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.5.0", RegexPatternTest().asyncAPISchema() @@ -192,49 +192,49 @@ abstract class AsyncAPIFormatSchemaV2_5_0Test: AsyncAPIFormatSchemaTest() { ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.5.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt index c6fa3aea..905fdab6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt @@ -34,49 +34,49 @@ abstract class AsyncAPIFormatSchemaV2_6_0Test: com.asyncapi.schemas.multiformat. override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.6.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.6.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.6.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.6.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.6.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/person.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.6.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=2.6.0", RegexPatternTest().asyncAPISchema() @@ -84,49 +84,49 @@ abstract class AsyncAPIFormatSchemaV2_6_0Test: com.asyncapi.schemas.multiformat. ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", RegexPatternTest().asyncAPISchema() @@ -142,49 +142,49 @@ abstract class AsyncAPIFormatSchemaV2_6_0Test: com.asyncapi.schemas.multiformat. override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.6.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.6.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.6.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.6.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.6.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.6.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=2.6.0", RegexPatternTest().asyncAPISchema() @@ -192,49 +192,49 @@ abstract class AsyncAPIFormatSchemaV2_6_0Test: com.asyncapi.schemas.multiformat. ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=2.6.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt index cecce11d..6e1d8c94 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt @@ -34,49 +34,49 @@ abstract class AsyncAPIFormatSchemaV3_0_0Test: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/arrays.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/complex-object.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/person.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema() @@ -84,49 +84,49 @@ abstract class AsyncAPIFormatSchemaV3_0_0Test: AsyncAPIFormatSchemaTest() { ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.json", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", RegexPatternTest().asyncAPISchema() @@ -142,49 +142,49 @@ abstract class AsyncAPIFormatSchemaV3_0_0Test: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+yaml;version=3.0.0", RegexPatternTest().asyncAPISchema() @@ -192,49 +192,49 @@ abstract class AsyncAPIFormatSchemaV3_0_0Test: AsyncAPIFormatSchemaTest() { ), // Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", + "/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi;version=3.0.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt index 06cb2a07..fe772fcc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt @@ -34,48 +34,48 @@ abstract class EmptySchemaFormatTest: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/arrays.schema.json", + "/schemas/multiformat/schemaFormat is empty/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/schemaFormat is empty/complex-object.schema.json", + Arguments.of("/schemas/multiformat/schemaFormat is empty/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.json", + "/schemas/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/enumerated-values.schema.json", + "/schemas/multiformat/schemaFormat is empty/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/person.schema.json", + "/schemas/multiformat/schemaFormat is empty/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/regex-pattern.schema.json", + "/schemas/multiformat/schemaFormat is empty/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema() @@ -91,48 +91,48 @@ abstract class EmptySchemaFormatTest: AsyncAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/arrays.schema.yaml", + "/schemas/multiformat/schemaFormat is empty/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/schemaFormat is empty/complex-object.schema.yaml", + Arguments.of("/schemas/multiformat/schemaFormat is empty/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/enumerated-values.schema.yaml", + "/schemas/multiformat/schemaFormat is empty/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/person.schema.yaml", + "/schemas/multiformat/schemaFormat is empty/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is empty/regex-pattern.schema.yaml", + "/schemas/multiformat/schemaFormat is empty/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt index 95eefc1e..13cf32fd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt @@ -34,49 +34,49 @@ abstract class NullSchemaFormatTest: com.asyncapi.schemas.multiformat.asyncapi.A override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/arrays.schema.json", + "/schemas/multiformat/schemaFormat is null/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/complex-object.schema.json", + "/schemas/multiformat/schemaFormat is null/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/conditional-validation-if-else.schema.json", + "/schemas/multiformat/schemaFormat is null/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/enumerated-values.schema.json", + "/schemas/multiformat/schemaFormat is null/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/person.schema.json", + "/schemas/multiformat/schemaFormat is null/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/regex-pattern.schema.json", + "/schemas/multiformat/schemaFormat is null/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema() @@ -92,49 +92,49 @@ abstract class NullSchemaFormatTest: com.asyncapi.schemas.multiformat.asyncapi.A override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/arrays.schema.yaml", + "/schemas/multiformat/schemaFormat is null/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/complex-object.schema.yaml", + "/schemas/multiformat/schemaFormat is null/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/schemaFormat is null/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/enumerated-values.schema.yaml", + "/schemas/multiformat/schemaFormat is null/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/person.schema.yaml", + "/schemas/multiformat/schemaFormat is null/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/schemaFormat is null/regex-pattern.schema.yaml", + "/schemas/multiformat/schemaFormat is null/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt index 72c2a7a2..eb91db9c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt @@ -34,49 +34,49 @@ abstract class WithoutSchemaFormatTest: com.asyncapi.schemas.multiformat.asyncap override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/arrays.schema.json", + "/schemas/multiformat/without schemaFormat/arrays.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/complex-object.schema.json", + "/schemas/multiformat/without schemaFormat/complex-object.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/conditional-validation-if-else.schema.json", + "/schemas/multiformat/without schemaFormat/conditional-validation-if-else.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/enumerated-values.schema.json", + "/schemas/multiformat/without schemaFormat/enumerated-values.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/person.schema.json", + "/schemas/multiformat/without schemaFormat/person.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/regex-pattern.schema.json", + "/schemas/multiformat/without schemaFormat/regex-pattern.schema.json", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema() @@ -92,49 +92,49 @@ abstract class WithoutSchemaFormatTest: com.asyncapi.schemas.multiformat.asyncap override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/arrays.schema.yaml", + "/schemas/multiformat/without schemaFormat/arrays.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ArraysSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/complex-object.schema.yaml", + "/schemas/multiformat/without schemaFormat/complex-object.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ComplexObjectTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/without schemaFormat/conditional-validation-if-else.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", ConditionalValidationIfElse().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", Draft07CoreSchemaMetaSchemaTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/enumerated-values.schema.yaml", + "/schemas/multiformat/without schemaFormat/enumerated-values.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", EnumeratedValuesTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/person.schema.yaml", + "/schemas/multiformat/without schemaFormat/person.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", PersonTest().asyncAPISchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/without schemaFormat/regex-pattern.schema.yaml", + "/schemas/multiformat/without schemaFormat/regex-pattern.schema.yaml", AsyncAPIFormatSchema( "application/vnd.aai.asyncapi+json;version=3.0.0", RegexPatternTest().asyncAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt index 55cc6569..c6b26eb5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt @@ -34,126 +34,126 @@ abstract class AvroFormatSchemaV1_10_0Test: AvroFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/ApplicationEvent.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/DocumentInfo.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/foo.Bar.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v1.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v2.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/logical-uuid.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/MyResponse.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-read.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-write.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/SchemaBuilder.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/simple_record.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestUnionRecord.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.0", AvroSchemasProvider().unionAndFixedFields() @@ -161,126 +161,126 @@ abstract class AvroFormatSchemaV1_10_0Test: AvroFormatSchemaTest() { ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().unionAndFixedFields() @@ -296,126 +296,126 @@ abstract class AvroFormatSchemaV1_10_0Test: AvroFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/foo.Bar.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v1.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v2.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical-uuid.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/MyResponse.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-read.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-write.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/simple_record.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.0", AvroSchemasProvider().unionAndFixedFields() @@ -423,126 +423,126 @@ abstract class AvroFormatSchemaV1_10_0Test: AvroFormatSchemaTest() { ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.0", AvroSchemasProvider().unionAndFixedFields() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt index a5a8bd3c..df0b8eae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt @@ -34,126 +34,126 @@ abstract class AvroFormatSchemaV1_10_1Test: AvroFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/ApplicationEvent.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/DocumentInfo.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/foo.Bar.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v1.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v2.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/logical-uuid.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/MyResponse.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-read.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-write.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/SchemaBuilder.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/simple_record.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestUnionRecord.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.1", AvroSchemasProvider().unionAndFixedFields() @@ -161,126 +161,126 @@ abstract class AvroFormatSchemaV1_10_1Test: AvroFormatSchemaTest() { ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().unionAndFixedFields() @@ -296,126 +296,126 @@ abstract class AvroFormatSchemaV1_10_1Test: AvroFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/foo.Bar.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v1.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v2.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical-uuid.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/MyResponse.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-read.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-write.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/simple_record.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.1", AvroSchemasProvider().unionAndFixedFields() @@ -423,126 +423,126 @@ abstract class AvroFormatSchemaV1_10_1Test: AvroFormatSchemaTest() { ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.1", AvroSchemasProvider().unionAndFixedFields() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt index d37f46ec..3f242770 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt @@ -34,126 +34,126 @@ abstract class AvroFormatSchemaV1_10_2Test: com.asyncapi.schemas.multiformat.avr override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/ApplicationEvent.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/DocumentInfo.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/foo.Bar.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v1.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v2.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/logical-uuid.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/MyResponse.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-read.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-write.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/SchemaBuilder.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/simple_record.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestUnionRecord.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.10.2", AvroSchemasProvider().unionAndFixedFields() @@ -161,126 +161,126 @@ abstract class AvroFormatSchemaV1_10_2Test: com.asyncapi.schemas.multiformat.avr ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().unionAndFixedFields() @@ -296,126 +296,126 @@ abstract class AvroFormatSchemaV1_10_2Test: com.asyncapi.schemas.multiformat.avr override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/foo.Bar.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v1.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v2.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical-uuid.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/MyResponse.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-read.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-write.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/simple_record.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.10.2", AvroSchemasProvider().unionAndFixedFields() @@ -423,126 +423,126 @@ abstract class AvroFormatSchemaV1_10_2Test: com.asyncapi.schemas.multiformat.avr ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.10.2", AvroSchemasProvider().unionAndFixedFields() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt index 54c3fc00..0c1b56c7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt @@ -34,126 +34,126 @@ abstract class AvroFormatSchemaV1_11_0Test: com.asyncapi.schemas.multiformat.avr override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/ApplicationEvent.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/DocumentInfo.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/foo.Bar.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v1.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v2.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/logical-uuid.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/MyResponse.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-read.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-write.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/SchemaBuilder.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/simple_record.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestUnionRecord.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.0", AvroSchemasProvider().unionAndFixedFields() @@ -161,126 +161,126 @@ abstract class AvroFormatSchemaV1_11_0Test: com.asyncapi.schemas.multiformat.avr ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().unionAndFixedFields() @@ -296,126 +296,126 @@ abstract class AvroFormatSchemaV1_11_0Test: com.asyncapi.schemas.multiformat.avr override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/foo.Bar.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v1.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v2.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical-uuid.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/MyResponse.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-read.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-write.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/simple_record.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.0", AvroSchemasProvider().unionAndFixedFields() @@ -423,126 +423,126 @@ abstract class AvroFormatSchemaV1_11_0Test: com.asyncapi.schemas.multiformat.avr ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.0", AvroSchemasProvider().unionAndFixedFields() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt index 659fce28..add37c66 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt @@ -34,126 +34,126 @@ abstract class AvroFormatSchemaV1_11_1Test: AvroFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/ApplicationEvent.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/DocumentInfo.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/foo.Bar.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v1.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v2.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/logical-uuid.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/MyResponse.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-read.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-write.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/SchemaBuilder.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/simple_record.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestUnionRecord.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.11.1", AvroSchemasProvider().unionAndFixedFields() @@ -161,126 +161,126 @@ abstract class AvroFormatSchemaV1_11_1Test: AvroFormatSchemaTest() { ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().unionAndFixedFields() @@ -296,126 +296,126 @@ abstract class AvroFormatSchemaV1_11_1Test: AvroFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/foo.Bar.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v1.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v2.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical-uuid.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/MyResponse.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-read.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-write.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/simple_record.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.11.1", AvroSchemasProvider().unionAndFixedFields() @@ -423,126 +423,126 @@ abstract class AvroFormatSchemaV1_11_1Test: AvroFormatSchemaTest() { ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.11.1", AvroSchemasProvider().unionAndFixedFields() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt index 134a184d..11bac268 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt @@ -34,126 +34,126 @@ abstract class AvroFormatSchemaV1_9_0Test: com.asyncapi.schemas.multiformat.avro override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/ApplicationEvent.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/DocumentInfo.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/foo.Bar.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v1.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v2.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/logical-uuid.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/MyResponse.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-read.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-write.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/SchemaBuilder.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/simple_record.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestUnionRecord.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.0", AvroSchemasProvider().unionAndFixedFields() @@ -161,126 +161,126 @@ abstract class AvroFormatSchemaV1_9_0Test: com.asyncapi.schemas.multiformat.avro ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().unionAndFixedFields() @@ -296,126 +296,126 @@ abstract class AvroFormatSchemaV1_9_0Test: com.asyncapi.schemas.multiformat.avro override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/foo.Bar.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v1.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v2.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical-uuid.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/MyResponse.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-read.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-write.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/simple_record.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.0", AvroSchemasProvider().unionAndFixedFields() @@ -423,126 +423,126 @@ abstract class AvroFormatSchemaV1_9_0Test: com.asyncapi.schemas.multiformat.avro ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.0", AvroSchemasProvider().unionAndFixedFields() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt index 6e4581a3..6d4fbf14 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt @@ -34,126 +34,126 @@ abstract class AvroFormatSchemaV1_9_1Test: com.asyncapi.schemas.multiformat.avro override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/ApplicationEvent.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/DocumentInfo.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/foo.Bar.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v1.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v2.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/logical-uuid.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/MyResponse.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-read.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-write.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/SchemaBuilder.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/simple_record.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestUnionRecord.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.1", AvroSchemasProvider().unionAndFixedFields() @@ -161,126 +161,126 @@ abstract class AvroFormatSchemaV1_9_1Test: com.asyncapi.schemas.multiformat.avro ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().unionAndFixedFields() @@ -296,126 +296,126 @@ abstract class AvroFormatSchemaV1_9_1Test: com.asyncapi.schemas.multiformat.avro override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/foo.Bar.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v1.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v2.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical-uuid.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/MyResponse.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-read.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-write.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/simple_record.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.1", AvroSchemasProvider().unionAndFixedFields() @@ -423,126 +423,126 @@ abstract class AvroFormatSchemaV1_9_1Test: com.asyncapi.schemas.multiformat.avro ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.1", AvroSchemasProvider().unionAndFixedFields() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt index 829733a3..fcc76ace 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt @@ -34,126 +34,126 @@ abstract class AvroFormatSchemaV1_9_2Test: AvroFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/ApplicationEvent.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/DocumentInfo.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/foo.Bar.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v1.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v2.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/logical-uuid.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/MyResponse.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-read.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-write.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/SchemaBuilder.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/simple_record.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestUnionRecord.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro+json;version=1.9.2", AvroSchemasProvider().unionAndFixedFields() @@ -161,126 +161,126 @@ abstract class AvroFormatSchemaV1_9_2Test: AvroFormatSchemaTest() { ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.json", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.json", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().unionAndFixedFields() @@ -296,126 +296,126 @@ abstract class AvroFormatSchemaV1_9_2Test: AvroFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/foo.Bar.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v1.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v2.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical-uuid.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/MyResponse.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-read.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-write.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/simple_record.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro+yaml;version=1.9.2", AvroSchemasProvider().unionAndFixedFields() @@ -423,126 +423,126 @@ abstract class AvroFormatSchemaV1_9_2Test: AvroFormatSchemaTest() { ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().applicationEventTest() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().documentInfo() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fooBar() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fullRecordV1() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().fullRecordV2() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().logicalUUID() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().logicalTypesWithMultipleFields() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().myResponse() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().regressionErrorFieldInRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocation() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocationRead() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaLocationWrite() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().schemaBuilder() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().simpleRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testRecordWithLogicalTypes() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testRecordWithMapsAndArrays() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().testUnionRecord() ) ), Arguments.of( - "/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.yaml", + "/schemas/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.yaml", AvroFormatSchema( "application/vnd.apache.avro;version=1.9.2", AvroSchemasProvider().unionAndFixedFields() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt index 90116eef..110ac27d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt @@ -54,31 +54,31 @@ abstract class JsonFormatSchemaTest { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/json/schema+json/arrays.schema.json", + "/schemas/multiformat/json/schema+json/arrays.schema.json", JsonFormatSchema(ArraysSchemaTest().jsonSchema()) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+json/complex-object.schema.json", + "/schemas/multiformat/json/schema+json/complex-object.schema.json", JsonFormatSchema(ComplexObjectTest().jsonSchema()) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+json/conditional-validation-if-else.schema.json", + "/schemas/multiformat/json/schema+json/conditional-validation-if-else.schema.json", JsonFormatSchema(ConditionalValidationIfElse().jsonSchema()) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+json/draft-07-core-schema-meta-schema.json", + "/schemas/multiformat/json/schema+json/draft-07-core-schema-meta-schema.json", JsonFormatSchema(Draft07CoreSchemaMetaSchemaTest().jsonSchema()) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+json/enumerated-values.schema.json", + "/schemas/multiformat/json/schema+json/enumerated-values.schema.json", JsonFormatSchema(EnumeratedValuesTest().jsonSchema()) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+json/person.schema.json", + "/schemas/multiformat/json/schema+json/person.schema.json", JsonFormatSchema(PersonTest().jsonSchema()) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+json/regex-pattern.schema.json", + "/schemas/multiformat/json/schema+json/regex-pattern.schema.json", JsonFormatSchema(RegexPatternTest().jsonSchema()) ) ) @@ -91,49 +91,49 @@ abstract class JsonFormatSchemaTest { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( Arguments.of( - "/json/v3/schema/multiformat/json/schema+yaml/arrays.schema.yaml", + "/schemas/multiformat/json/schema+yaml/arrays.schema.yaml", JsonFormatSchema( "application/schema+yaml;version=draft-07", ArraysSchemaTest().jsonSchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+yaml/complex-object.schema.yaml", + "/schemas/multiformat/json/schema+yaml/complex-object.schema.yaml", JsonFormatSchema( "application/schema+yaml;version=draft-07", ComplexObjectTest().jsonSchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+yaml/conditional-validation-if-else.schema.yaml", + "/schemas/multiformat/json/schema+yaml/conditional-validation-if-else.schema.yaml", JsonFormatSchema( "application/schema+yaml;version=draft-07", ConditionalValidationIfElse().jsonSchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+yaml/draft-07-core-schema-meta-schema.yaml", + "/schemas/multiformat/json/schema+yaml/draft-07-core-schema-meta-schema.yaml", JsonFormatSchema( "application/schema+yaml;version=draft-07", Draft07CoreSchemaMetaSchemaTest().jsonSchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+yaml/enumerated-values.schema.yaml", + "/schemas/multiformat/json/schema+yaml/enumerated-values.schema.yaml", JsonFormatSchema( "application/schema+yaml;version=draft-07", EnumeratedValuesTest().jsonSchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+yaml/person.schema.yaml", + "/schemas/multiformat/json/schema+yaml/person.schema.yaml", JsonFormatSchema( "application/schema+yaml;version=draft-07", PersonTest().jsonSchema() ) ), Arguments.of( - "/json/v3/schema/multiformat/json/schema+yaml/regex-pattern.schema.yaml", + "/schemas/multiformat/json/schema+yaml/regex-pattern.schema.yaml", JsonFormatSchema( "application/schema+yaml;version=draft-07", RegexPatternTest().jsonSchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt index 5e6dcd8f..ea4d7c2a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt @@ -33,13 +33,13 @@ abstract class OpenAPIFormatSchemaV3_0_0Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.json", + Arguments.of("/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.json", OpenAPIFormatSchema( "application/vnd.oai.openapi;version=3.0.0", SchemaTest().openAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi+json/schema.json", + Arguments.of("/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi+json/schema.json", OpenAPIFormatSchema( "application/vnd.oai.openapi+json;version=3.0.0", SchemaTest().openAPISchema() @@ -54,13 +54,13 @@ abstract class OpenAPIFormatSchemaV3_0_0Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.yaml", + Arguments.of("/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.yaml", OpenAPIFormatSchema( "application/vnd.oai.openapi;version=3.0.0", SchemaTest().openAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi+yaml/schema.yaml", + Arguments.of("/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi+yaml/schema.yaml", OpenAPIFormatSchema( "application/vnd.oai.openapi+yaml;version=3.0.0", SchemaTest().openAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt index 3d4b50d6..afadcfc8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt @@ -33,13 +33,13 @@ abstract class OpenAPIFormatSchemaV3_0_1Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.json", + Arguments.of("/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.json", OpenAPIFormatSchema( "application/vnd.oai.openapi;version=3.0.1", SchemaTest().openAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi+json/schema.json", + Arguments.of("/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi+json/schema.json", OpenAPIFormatSchema( "application/vnd.oai.openapi+json;version=3.0.1", SchemaTest().openAPISchema() @@ -54,13 +54,13 @@ abstract class OpenAPIFormatSchemaV3_0_1Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.yaml", + Arguments.of("/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.yaml", OpenAPIFormatSchema( "application/vnd.oai.openapi;version=3.0.1", SchemaTest().openAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi+yaml/schema.yaml", + Arguments.of("/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi+yaml/schema.yaml", OpenAPIFormatSchema( "application/vnd.oai.openapi+yaml;version=3.0.1", SchemaTest().openAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt index 2e80923d..47f569bf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt @@ -33,13 +33,13 @@ abstract class OpenAPIFormatSchemaV3_0_2Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.json", + Arguments.of("/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.json", OpenAPIFormatSchema( "application/vnd.oai.openapi;version=3.0.2", SchemaTest().openAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi+json/schema.json", + Arguments.of("/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi+json/schema.json", OpenAPIFormatSchema( "application/vnd.oai.openapi+json;version=3.0.2", SchemaTest().openAPISchema() @@ -54,13 +54,13 @@ abstract class OpenAPIFormatSchemaV3_0_2Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.yaml", + Arguments.of("/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.yaml", OpenAPIFormatSchema( "application/vnd.oai.openapi;version=3.0.2", SchemaTest().openAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi+yaml/schema.yaml", + Arguments.of("/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi+yaml/schema.yaml", OpenAPIFormatSchema( "application/vnd.oai.openapi+yaml;version=3.0.2", SchemaTest().openAPISchema() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt index 81b5346b..031371d3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt @@ -33,13 +33,13 @@ abstract class OpenAPIFormatSchemaV3_0_3Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.json", + Arguments.of("/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.json", OpenAPIFormatSchema( "application/vnd.oai.openapi;version=3.0.3", SchemaTest().openAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi+json/schema.json", + Arguments.of("/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi+json/schema.json", OpenAPIFormatSchema( "application/vnd.oai.openapi+json;version=3.0.3", SchemaTest().openAPISchema() @@ -54,13 +54,13 @@ abstract class OpenAPIFormatSchemaV3_0_3Test: OpenAPIFormatSchemaTest() { override fun provideArguments(context: ExtensionContext?): Stream { return Stream.of( - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.yaml", + Arguments.of("/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.yaml", OpenAPIFormatSchema( "application/vnd.oai.openapi;version=3.0.3", SchemaTest().openAPISchema() ) ), - Arguments.of("/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi+yaml/schema.yaml", + Arguments.of("/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi+yaml/schema.yaml", OpenAPIFormatSchema( "application/vnd.oai.openapi+yaml;version=3.0.3", SchemaTest().openAPISchema() diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+json/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.1.0/vnd.aai.asyncapi/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+json/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.2.0/vnd.aai.asyncapi/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+json/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.3.0/vnd.aai.asyncapi/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+json/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.4.0/vnd.aai.asyncapi/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+json/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.5.0/vnd.aai.asyncapi/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+json/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/2.6.0/vnd.aai.asyncapi/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+json/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi+yaml/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/asyncapi/3.0.0/vnd.aai.asyncapi/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+json/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+json/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.0/vnd.apache.avro/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+json/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+json/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.1/vnd.apache.avro/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+json/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+json/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.10.2/vnd.apache.avro/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+json/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+json/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.0/vnd.apache.avro/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+json/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+json/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.11.1/vnd.apache.avro/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+json/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+json/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro+yaml/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.0/vnd.apache.avro/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+json/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+json/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro+yaml/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.1/vnd.apache.avro/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+json/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+json/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro+yaml/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/ApplicationEvent.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/DocumentInfo.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/MyResponse.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/SchemaBuilder.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithLogicalTypes.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestRecordWithMapsAndArrays.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/TestUnionRecord.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/foo.Bar.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v1.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/full_record_v2.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical-uuid.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/logical_types_with_multiple_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/regression_error_field_in_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-read.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location-write.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/schema-location.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/simple_record.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.json b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.json rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/avro/1.9.2/vnd.apache.avro/union_and_fixed_fields.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+json/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+json/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/json/schema+yaml/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/json/schema+yaml/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi+json/schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi+json/schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi+json/schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi+json/schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi+yaml/schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi+yaml/schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi+yaml/schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi+yaml/schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.0/vnd.oai.openapi/schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi+json/schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi+json/schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi+json/schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi+json/schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi+yaml/schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi+yaml/schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi+yaml/schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi+yaml/schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.1/vnd.oai.openapi/schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi+json/schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi+json/schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi+json/schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi+json/schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi+yaml/schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi+yaml/schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi+yaml/schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi+yaml/schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.2/vnd.oai.openapi/schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi+json/schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi+json/schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi+json/schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi+json/schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi+yaml/schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi+yaml/schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi+yaml/schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi+yaml/schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/openapi/3.0.3/vnd.oai.openapi/schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is empty/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is empty/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/schemaFormat is null/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/schemaFormat is null/regex-pattern.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/arrays.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/arrays.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/arrays.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/arrays.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/arrays.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/arrays.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/arrays.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/arrays.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/complex-object.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/complex-object.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/complex-object.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/complex-object.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/complex-object.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/complex-object.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/complex-object.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/complex-object.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/conditional-validation-if-else.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/conditional-validation-if-else.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/conditional-validation-if-else.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/conditional-validation-if-else.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/conditional-validation-if-else.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/conditional-validation-if-else.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/conditional-validation-if-else.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/conditional-validation-if-else.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/draft-07-core-schema-meta-schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/enumerated-values.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/enumerated-values.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/enumerated-values.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/enumerated-values.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/enumerated-values.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/enumerated-values.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/enumerated-values.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/enumerated-values.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/person.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/person.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/person.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/person.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/person.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/person.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/person.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/person.schema.yaml diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/regex-pattern.schema.json b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/regex-pattern.schema.json similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/regex-pattern.schema.json rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/regex-pattern.schema.json diff --git a/asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/regex-pattern.schema.yaml b/asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/regex-pattern.schema.yaml similarity index 100% rename from asyncapi-core/src/test/resources/json/v3/schema/multiformat/without schemaFormat/regex-pattern.schema.yaml rename to asyncapi-core/src/test/resources/schemas/multiformat/without schemaFormat/regex-pattern.schema.yaml From e7cb5b44717810d5506a062e89acc67cf13a1726 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 9 May 2024 01:38:23 +0400 Subject: [PATCH 095/141] feat(schemas): move JsonSchema to json package --- .../schemas/jackson/JsonSchemaAnyValueDeserializer.java | 2 +- .../schemas/jackson/JsonSchemaItemsDeserializer.java | 2 +- .../schemas/jackson/JsonSchemaPropertiesDeserializer.java | 2 +- .../java/com/asyncapi/schemas/{ => json}/JsonSchema.java | 2 +- .../com/asyncapi/schemas/multiformat/JsonFormatSchema.java | 2 +- .../jackson/model/channel/message/MessageDeserializer.java | 2 +- .../com/asyncapi/v2/_6_0/model/channel/message/Message.java | 2 +- .../asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt | 1 - .../examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt | 5 +++-- .../com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt | 2 +- .../kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt | 1 + .../src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt | 1 + .../kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt | 1 - .../kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt | 1 - .../com/asyncapi/schemas/json/ConditionalValidationIfElse.kt | 1 - .../asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt | 1 - .../kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt | 1 - .../src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt | 1 - .../kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt | 1 - .../schemas/json/properties/ConstDefaultExamplesArrayTest.kt | 2 +- .../properties/ConstDefaultExamplesBigDecimalMaximumTest.kt | 2 +- .../properties/ConstDefaultExamplesBigDecimalMinimumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesBigDecimalTest.kt | 2 +- .../properties/ConstDefaultExamplesBigIntegerMaximumTest.kt | 2 +- .../properties/ConstDefaultExamplesBigIntegerMinimumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesBigIntegerTest.kt | 2 +- .../json/properties/ConstDefaultExamplesBooleanFalseTest.kt | 2 +- .../json/properties/ConstDefaultExamplesBooleanTrueTest.kt | 2 +- .../json/properties/ConstDefaultExamplesDoubleMaximumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesDoubleMinimumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesDoubleTest.kt | 2 +- .../json/properties/ConstDefaultExamplesIntMaximumTest.kt | 2 +- .../json/properties/ConstDefaultExamplesIntMinimumTest.kt | 2 +- .../schemas/json/properties/ConstDefaultExamplesIntTest.kt | 2 +- .../schemas/json/properties/ConstDefaultExamplesNullTest.kt | 2 +- .../json/properties/ConstDefaultExamplesObjectTest.kt | 2 +- .../com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt | 2 +- 37 files changed, 31 insertions(+), 36 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => json}/JsonSchema.java (99%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java index 70e8e1a2..4d26fb49 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.jackson; -import com.asyncapi.schemas.JsonSchema; +import com.asyncapi.schemas.json.JsonSchema; /** * Json Schema any value deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java index 94e92771..156872ea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.jackson; import com.asyncapi.v3.jackson.SchemaItemsDeserializer; -import com.asyncapi.schemas.JsonSchema; +import com.asyncapi.schemas.json.JsonSchema; /** * Json Schema items deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java index 972bd1cb..d6c5be6c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.jackson; -import com.asyncapi.schemas.JsonSchema; +import com.asyncapi.schemas.json.JsonSchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/json/JsonSchema.java similarity index 99% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/json/JsonSchema.java index 54e08bfc..9be5f8e5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/JsonSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/json/JsonSchema.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas; +package com.asyncapi.schemas.json; import com.asyncapi.schemas.jackson.JsonSchemaAnyValueDeserializer; import com.asyncapi.schemas.jackson.JsonSchemaItemsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java index d496f40f..98b00ea6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat; import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.JsonSchema; +import com.asyncapi.schemas.json.JsonSchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java index 4694f5e0..f71f7da3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java @@ -3,7 +3,7 @@ import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.JsonSchema; +import com.asyncapi.schemas.json.JsonSchema; import com.asyncapi.schemas.Reference; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java index a114db83..9b9511db 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java @@ -4,7 +4,7 @@ import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.schemas.AsyncAPISchema; import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.JsonSchema; +import com.asyncapi.schemas.json.JsonSchema; import com.asyncapi.schemas.Reference; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt index 606fa95e..853d7197 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt @@ -1,7 +1,6 @@ package com.asyncapi.examples.v2._6_0 import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt index a57935ab..7f7d0e85 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message @@ -53,7 +53,8 @@ class SchemaFormatJsonSchemaPayload: AbstractExampleValidationTest() { .summary("Product representing items in inventory") .contentType("application/json") .schemaFormat("application/schema+json;version=draft-07") - .payload(JsonSchema.builder() + .payload( + JsonSchema.builder() .id("https://example.com/person.schema.json") .schema("http://json-schema.org/draft-07/schema#") .title("Person") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index 101c25ca..d96c3557 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -13,7 +13,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.multiformat.JsonFormatSchema import com.asyncapi.schemas.security.v3.http.HttpSecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt index 29bc764d..f765a0b0 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.json.properties.* import com.asyncapi.v3.ClasspathUtils import com.fasterxml.jackson.annotation.JsonInclude diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt index 1d9b05d3..455ed38f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema import com.asyncapi.schemas.multiformat.JsonFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt index b637f98f..ad341504 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt @@ -1,7 +1,6 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.SchemaProvider class ArraysSchemaTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt index fcc32bbf..30e7f459 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt @@ -1,7 +1,6 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt index 10d5ab5e..7673b3eb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt @@ -1,7 +1,6 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConditionalValidationIfElse: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt index 5713470e..9214340a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt @@ -1,7 +1,6 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt index b6328c0c..8e9019c5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt @@ -1,7 +1,6 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.SchemaProvider class EnumeratedValuesTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt index 0eba35b6..a91fd462 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt @@ -1,7 +1,6 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt index 7e61fd45..e038d39e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt @@ -1,7 +1,6 @@ package com.asyncapi.schemas.json import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema import com.asyncapi.schemas.SchemaProvider class RegexPatternTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt index 7b8bf8fa..dfc00839 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesArrayTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt index 00656f29..f84b40fd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt index 4ccde37b..74fc38f3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt index 943b9bc1..8668f7e1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt index 49cc9d88..a908c021 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt index 337e3f1f..96c8c928 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt index c3f7ccab..d5afc5a8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt index 4d35eee9..0130ac09 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesBooleanFalseTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt index 2675cfec..891f13e8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesBooleanTrueTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt index fd9bec12..ce076e79 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesDoubleMaximumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt index d7c31e88..ee0aaf00 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesDoubleMinimumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt index 496b4006..6cfd91e6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesDoubleTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt index c966b87e..53312526 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesIntMaximumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt index f6c2c6f0..c73ab66d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesIntMinimumTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt index 604666e8..a41c24dc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesIntTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt index 91a97588..52d4f13d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesNullTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt index c760c258..83ea1810 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.json.properties import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider class ConstDefaultExamplesObjectTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt index 6c5a9591..4a611b37 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyTestWithReferenc import com.asyncapi.v3._0_0.model.server.ServerTest import com.asyncapi.v3._0_0.model.server.ServerVariableTest import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.JsonSchema +import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.Type import com.asyncapi.schemas.multiformat.JsonFormatSchema import com.asyncapi.schemas.security.v3.ApiKeySecuritySchemeTest From 5df71a99a8b9e438bc4ae4128ce3df866d8de4f3 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Fri, 10 May 2024 01:39:19 +0400 Subject: [PATCH 096/141] feat(schemas): move AsyncAPI schemas to asyncapi --- .../com/asyncapi/bindings/ChannelBinding.java | 2 +- .../bindings/ChannelBindingsDeserializer.java | 2 +- .../com/asyncapi/bindings/MessageBinding.java | 2 +- .../bindings/MessageBindingsDeserializer.java | 2 +- .../asyncapi/bindings/OperationBinding.java | 2 +- .../OperationBindingsDeserializer.java | 2 +- .../com/asyncapi/bindings/ServerBinding.java | 2 +- .../bindings/ServerBindingsDeserializer.java | 2 +- .../message/AnypointMQMessageBinding.java | 2 +- .../v0/_1_0/message/HTTPMessageBinding.java | 2 +- .../_1_0/operation/HTTPOperationBinding.java | 2 +- .../v0/_2_0/message/HTTPMessageBinding.java | 2 +- .../_2_0/operation/HTTPOperationBinding.java | 2 +- .../v0/_3_0/message/HTTPMessageBinding.java | 2 +- .../_3_0/operation/HTTPOperationBinding.java | 2 +- .../v0/_0_1/message/JMSMessageBinding.java | 2 +- .../v0/_4_0/message/KafkaMessageBinding.java | 2 +- .../_4_0/operation/KafkaOperationBinding.java | 2 +- .../channel/WebSocketsChannelBinding.java | 2 +- .../{ => asyncapi}/AsyncAPISchema.java | 4 +- .../{ => asyncapi}/ExtendableObject.java | 2 +- .../schemas/{ => asyncapi}/Reference.java | 2 +- .../multiformat/AsyncAPIFormatSchema.java | 4 +- .../multiformat/AvroFormatSchema.java | 6 +- .../multiformat/JsonFormatSchema.java | 4 +- .../multiformat/MultiFormatSchema.java | 8 +- .../multiformat/OpenAPIFormatSchema.java | 4 +- .../security/v2/ApiKeySecurityScheme.java | 2 +- .../v2/OpenIdConnectSecurityScheme.java | 2 +- .../security/v2/SecurityScheme.java | 10 +- .../v2/http/HttpApiKeySecurityScheme.java | 4 +- .../security/v2/http/HttpSecurityScheme.java | 4 +- .../v2/oauth2/OAuth2SecurityScheme.java | 4 +- .../security/v2/oauth2/OAuthFlows.java | 12 +- .../flow/AuthorizationCodeOAuthFlow.java | 2 +- .../flow/ClientCredentialsOAuthFlow.java | 4 +- .../v2/oauth2/flow/ImplicitOAuthFlow.java | 4 +- .../security/v2/oauth2/flow/OAuthFlow.java | 4 +- .../v2/oauth2/flow/PasswordOAuthFlow.java | 4 +- .../security/v3/ApiKeySecurityScheme.java | 2 +- .../v3/OpenIdConnectSecurityScheme.java | 2 +- .../security/v3/SecurityScheme.java | 10 +- .../v3/http/HttpApiKeySecurityScheme.java | 4 +- .../security/v3/http/HttpSecurityScheme.java | 4 +- .../v3/oauth2/OAuth2SecurityScheme.java | 4 +- .../security/v3/oauth2/OAuthFlows.java | 12 +- .../flow/AuthorizationCodeOAuthFlow.java | 4 +- .../flow/ClientCredentialsOAuthFlow.java | 4 +- .../v3/oauth2/flow/ImplicitOAuthFlow.java | 4 +- .../security/v3/oauth2/flow/OAuthFlow.java | 4 +- .../v3/oauth2/flow/PasswordOAuthFlow.java | 4 +- .../_9_0/jackson/AvroSchemaDeserializer.java | 2 +- ...chemaAdditionalPropertiesDeserializer.java | 2 +- .../AsyncAPISchemaAnyValueDeserializer.java | 2 +- .../AsyncAPISchemaItemsDeserializer.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 4 +- .../message/MessagePayloadDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../OperationMessageDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 4 +- ...ComponentsSecuritySchemesDeserializer.java | 4 +- ...hemasAdditionalPropertiesDeserializer.java | 2 +- .../com/asyncapi/v2/_0_0/model/AsyncAPI.java | 2 +- .../v2/_0_0/model/ExternalDocumentation.java | 2 +- .../java/com/asyncapi/v2/_0_0/model/Tag.java | 2 +- .../v2/_0_0/model/channel/ChannelItem.java | 4 +- .../v2/_0_0/model/channel/Parameter.java | 4 +- .../model/channel/message/CorrelationId.java | 2 +- .../_0_0/model/channel/message/Message.java | 6 +- .../model/channel/message/MessageTrait.java | 6 +- .../model/channel/operation/Operation.java | 4 +- .../channel/operation/OperationTrait.java | 2 +- .../v2/_0_0/model/component/Components.java | 8 +- .../asyncapi/v2/_0_0/model/info/Contact.java | 2 +- .../com/asyncapi/v2/_0_0/model/info/Info.java | 2 +- .../asyncapi/v2/_0_0/model/info/License.java | 2 +- .../asyncapi/v2/_0_0/model/server/Server.java | 2 +- .../v2/_0_0/model/server/ServerVariable.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../channel/message/MessageDeserializer.java | 6 +- .../message/MessageHeadersDeserializer.java | 4 +- .../message/MessageTraitsDeserializer.java | 2 +- .../channel/message/MessagesDeserializer.java | 2 +- .../OperationMessageDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../ComponentsCorrelationIdsDeserializer.java | 2 +- .../ComponentsMessageTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- ...ComponentsOperationTraitsDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 6 +- ...ComponentsSecuritySchemesDeserializer.java | 4 +- ...ComponentsServerVariablesDeserializer.java | 2 +- .../ComponentsServersDeserializer.java | 2 +- .../model/schema/SchemaDeserializer.java | 4 +- ...hemasAdditionalPropertiesDeserializer.java | 2 +- .../server/ServerVariablesDeserializer.java | 2 +- .../model/server/ServersDeserializer.java | 2 +- .../com/asyncapi/v2/_6_0/model/AsyncAPI.java | 4 +- .../v2/_6_0/model/ExternalDocumentation.java | 2 +- .../java/com/asyncapi/v2/_6_0/model/Tag.java | 2 +- .../v2/_6_0/model/channel/ChannelItem.java | 4 +- .../v2/_6_0/model/channel/Parameter.java | 7 +- .../model/channel/message/CorrelationId.java | 2 +- .../_6_0/model/channel/message/Message.java | 8 +- .../model/channel/message/MessageExample.java | 2 +- .../model/channel/message/MessageTrait.java | 9 +- .../model/channel/message/OneOfMessages.java | 2 +- .../model/channel/operation/Operation.java | 4 +- .../channel/operation/OperationTrait.java | 4 +- .../v2/_6_0/model/component/Components.java | 10 +- .../asyncapi/v2/_6_0/model/info/Contact.java | 2 +- .../com/asyncapi/v2/_6_0/model/info/Info.java | 2 +- .../asyncapi/v2/_6_0/model/info/License.java | 2 +- .../asyncapi/v2/_6_0/model/server/Server.java | 4 +- .../v2/_6_0/model/server/ServerVariable.java | 2 +- .../v2/jackson/SchemaItemsDeserializer.java | 2 +- .../ExternalDocumentationDeserializer.java | 2 +- .../_0_0/jackson/model/TagsDeserializer.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../model/channel/ChannelsDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 6 +- .../message/MessagePayloadDeserializer.java | 6 +- .../message/MessageTraitsDeserializer.java | 2 +- .../channel/message/MessagesDeserializer.java | 2 +- .../ComponentsChannelsDeserializer.java | 2 +- .../ComponentsCorrelationIdsDeserializer.java | 2 +- .../ComponentsExternalDocsDeserializer.java | 2 +- .../ComponentsMessageTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- ...ComponentsOperationTraitsDeserializer.java | 2 +- .../ComponentsOperationsDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsRepliesDeserializer.java | 2 +- .../ComponentsReplyAddressesDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 6 +- ...ComponentsSecuritySchemesDeserializer.java | 4 +- ...ComponentsServerVariablesDeserializer.java | 2 +- .../ComponentsServersDeserializer.java | 2 +- .../component/ComponentsTagsDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../operation/OperationsDeserializer.java | 2 +- .../OperationReplyAddressDeserializer.java | 2 +- .../reply/OperationReplyDeserializer.java | 2 +- .../server/ServerVariablesDeserializer.java | 2 +- .../model/server/ServersDeserializer.java | 2 +- .../com/asyncapi/v3/_0_0/model/AsyncAPI.java | 4 +- .../v3/_0_0/model/ExternalDocumentation.java | 2 +- .../java/com/asyncapi/v3/_0_0/model/Tag.java | 4 +- .../v3/_0_0/model/channel/Channel.java | 4 +- .../v3/_0_0/model/channel/Parameter.java | 2 +- .../model/channel/message/CorrelationId.java | 2 +- .../_0_0/model/channel/message/Message.java | 8 +- .../model/channel/message/MessageExample.java | 2 +- .../model/channel/message/MessageTrait.java | 8 +- .../v3/_0_0/model/component/Components.java | 10 +- .../asyncapi/v3/_0_0/model/info/Contact.java | 2 +- .../com/asyncapi/v3/_0_0/model/info/Info.java | 4 +- .../asyncapi/v3/_0_0/model/info/License.java | 2 +- .../v3/_0_0/model/operation/Operation.java | 6 +- .../_0_0/model/operation/OperationTrait.java | 6 +- .../model/operation/reply/OperationReply.java | 4 +- .../reply/OperationReplyAddress.java | 2 +- .../asyncapi/v3/_0_0/model/server/Server.java | 6 +- .../v3/_0_0/model/server/ServerVariable.java | 2 +- .../SecuritySchemesDeserializer.java | 4 +- .../com/asyncapi/bindings/BindingTest.java | 2 +- .../anypointmq/AnypointMQV0_0_1Test.java | 2 +- .../bindings/http/HTTPV0_1_0Test.java | 2 +- .../bindings/http/HTTPV0_2_0Test.java | 2 +- .../bindings/http/HTTPV0_3_0Test.java | 2 +- .../asyncapi/bindings/jms/JMSV0_1_0Test.java | 2 +- .../bindings/kafka/KafkaV0_4_0Test.java | 2 +- .../websockets/WebSocketsV0_1_0Test.java | 2 +- .../com/asyncapi/examples/v2/_0_0/AnyOf.kt | 7 +- .../examples/v2/_0_0/ApplicationHeaders.kt | 9 +- .../examples/v2/_0_0/CorrelationId.kt | 41 +++-- .../examples/v2/_0_0/GitterStreaming.kt | 30 +-- .../com/asyncapi/examples/v2/_0_0/Mercure.kt | 10 +- .../com/asyncapi/examples/v2/_0_0/Not.kt | 4 +- .../com/asyncapi/examples/v2/_0_0/OneOf.kt | 7 +- .../examples/v2/_0_0/OperationSecurity.kt | 16 +- .../asyncapi/examples/v2/_0_0/RpcClient.kt | 11 +- .../asyncapi/examples/v2/_0_0/RpcServer.kt | 11 +- .../com/asyncapi/examples/v2/_0_0/Simple.kt | 7 +- .../com/asyncapi/examples/v2/_0_0/SlackRtm.kt | 172 ++++++++++++------ .../examples/v2/_0_0/StreetlightsKafka.kt | 25 +-- .../examples/v2/_0_0/StreetlightsMQTT.kt | 47 ++--- .../v2/_0_0/StreetlightsOperationSecurity.kt | 23 +-- .../examples/v2/_0_0/WebsocketGemini.kt | 10 +- .../com/asyncapi/examples/v2/_6_0/AnyOf.kt | 7 +- .../examples/v2/_6_0/ApplicationHeaders.kt | 9 +- .../examples/v2/_6_0/CorrelationId.kt | 41 +++-- .../examples/v2/_6_0/GitterStreaming.kt | 30 +-- .../com/asyncapi/examples/v2/_6_0/Mercure.kt | 10 +- .../com/asyncapi/examples/v2/_6_0/Not.kt | 4 +- .../com/asyncapi/examples/v2/_6_0/OneOf.kt | 7 +- .../examples/v2/_6_0/OperationSecurity.kt | 16 +- .../asyncapi/examples/v2/_6_0/RpcClient.kt | 11 +- .../asyncapi/examples/v2/_6_0/RpcServer.kt | 11 +- .../v2/_6_0/SchemaFormatAsyncAPIPayload.kt | 7 +- .../v2/_6_0/SchemaFormatAvroPayload.kt | 2 +- .../v2/_6_0/SchemaFormatJsonSchemaPayload.kt | 2 +- .../v2/_6_0/SchemaFormatOpenAPIPayload.kt | 2 +- .../SchemaFormatReferenceToAsyncAPIPayload.kt | 2 +- .../SchemaFormatReferenceToAvroPayload.kt | 2 +- ...chemaFormatReferenceToJsonSchemaPayload.kt | 2 +- .../SchemaFormatReferenceToOpenAPIPayload.kt | 2 +- .../com/asyncapi/examples/v2/_6_0/Simple.kt | 7 +- .../com/asyncapi/examples/v2/_6_0/SlackRtm.kt | 172 ++++++++++++------ .../examples/v2/_6_0/StreetlightsKafka.kt | 25 +-- .../examples/v2/_6_0/StreetlightsMQTT.kt | 47 ++--- .../v2/_6_0/StreetlightsOperationSecurity.kt | 23 +-- .../examples/v2/_6_0/WebsocketGemini.kt | 10 +- .../v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt | 40 ++-- .../examples/v3/_0_0/AnyOfAsyncAPI.kt | 4 +- .../v3/_0_0/ApplicationHeadersAsyncAPI.kt | 4 +- .../examples/v3/_0_0/CorrelationIdAsyncAPI.kt | 55 +++--- .../v3/_0_0/GitterStreamingAsyncAPI.kt | 8 +- ...equestReplyMessageFilterInReplyAsyncAPI.kt | 32 ++-- ...ketRequestReplyMultipleChannelsAsyncAPI.kt | 26 +-- .../examples/v3/_0_0/MercureAsyncAPI.kt | 4 +- .../asyncapi/examples/v3/_0_0/NotAsyncAPI.kt | 4 +- .../examples/v3/_0_0/OneOfAsyncAPI.kt | 4 +- .../v3/_0_0/OperationSecurityAsyncAPI.kt | 14 +- .../examples/v3/_0_0/RpcClientAsyncAPI.kt | 4 +- .../examples/v3/_0_0/RpcServerAsyncAPI.kt | 4 +- .../examples/v3/_0_0/SimpleAsyncAPI.kt | 4 +- .../examples/v3/_0_0/SlackRtmAsyncAPI.kt | 17 +- .../v3/_0_0/StreetlightsKafkaAsyncAPI.kt | 32 ++-- .../v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 58 +++--- .../StreetlightsOperationSecurityAsyncAPI.kt | 43 ++--- .../v3/_0_0/WebsocketGeminiAsyncAPI.kt | 6 +- .../schemas/ReadJsonPropertiesTest.kt | 1 + .../asyncapi/schemas/ReadJsonSchemaTest.kt | 1 + .../com/asyncapi/schemas/SchemaProvider.kt | 5 +- .../asyncapi/schemas/json/ArraysSchemaTest.kt | 2 +- .../schemas/json/ComplexObjectTest.kt | 2 +- .../json/ConditionalValidationIfElse.kt | 2 +- .../json/Draft07CoreSchemaMetaSchemaTest.kt | 2 +- .../schemas/json/EnumeratedValuesTest.kt | 2 +- .../com/asyncapi/schemas/json/PersonTest.kt | 2 +- .../asyncapi/schemas/json/RegexPatternTest.kt | 2 +- .../ConstDefaultExamplesArrayTest.kt | 2 +- ...nstDefaultExamplesBigDecimalMaximumTest.kt | 2 +- ...nstDefaultExamplesBigDecimalMinimumTest.kt | 2 +- .../ConstDefaultExamplesBigDecimalTest.kt | 2 +- ...nstDefaultExamplesBigIntegerMaximumTest.kt | 2 +- ...nstDefaultExamplesBigIntegerMinimumTest.kt | 2 +- .../ConstDefaultExamplesBigIntegerTest.kt | 2 +- .../ConstDefaultExamplesBooleanFalseTest.kt | 2 +- .../ConstDefaultExamplesBooleanTrueTest.kt | 2 +- .../ConstDefaultExamplesDoubleMaximumTest.kt | 2 +- .../ConstDefaultExamplesDoubleMinimumTest.kt | 2 +- .../ConstDefaultExamplesDoubleTest.kt | 2 +- .../ConstDefaultExamplesIntMaximumTest.kt | 2 +- .../ConstDefaultExamplesIntMinimumTest.kt | 2 +- .../properties/ConstDefaultExamplesIntTest.kt | 2 +- .../ConstDefaultExamplesNullTest.kt | 2 +- .../ConstDefaultExamplesObjectTest.kt | 2 +- .../asyncapi/AsyncAPIFormatSchemaTest.kt | 2 +- .../AsyncAPIFormatSchemaV2_0_0Test.kt | 2 +- .../AsyncAPIFormatSchemaV2_1_0Test.kt | 2 +- .../AsyncAPIFormatSchemaV2_2_0Test.kt | 2 +- .../AsyncAPIFormatSchemaV2_3_0Test.kt | 2 +- .../AsyncAPIFormatSchemaV2_4_0Test.kt | 2 +- .../AsyncAPIFormatSchemaV2_5_0Test.kt | 2 +- .../AsyncAPIFormatSchemaV2_6_0Test.kt | 2 +- .../AsyncAPIFormatSchemaV3_0_0Test.kt | 2 +- .../asyncapi/EmptySchemaFormatTest.kt | 2 +- .../asyncapi/NullSchemaFormatTest.kt | 2 +- .../asyncapi/WithoutSchemaFormatTest.kt | 2 +- .../multiformat/avro/AvroFormatSchemaTest.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_10_0Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_10_1Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_10_2Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_11_0Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_11_1Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_9_0Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_9_1Test.kt | 2 +- .../avro/AvroSchemaFormatSchemaV1_9_2Test.kt | 2 +- .../multiformat/json/JsonFormatSchemaTest.kt | 10 +- .../openapi/OpenAPIFormatSchemaTest.kt | 2 +- .../openapi/OpenAPIFormatSchemaV3_0_0Test.kt | 2 +- .../openapi/OpenAPIFormatSchemaV3_0_1Test.kt | 2 +- .../openapi/OpenAPIFormatSchemaV3_0_2Test.kt | 2 +- .../openapi/OpenAPIFormatSchemaV3_0_3Test.kt | 2 +- .../security/v2/ApiKeySecuritySchemeTest.kt | 2 + .../AsymmetricEncryptionSecuritySchemeTest.kt | 1 + .../security/v2/GssapiSecuritySchemeTest.kt | 1 + .../v2/OpenIdConnectSecuritySchemeTest.kt | 2 + .../security/v2/PlainSecuritySchemeTest.kt | 1 + .../v2/ScramSha256SecuritySchemeTest.kt | 1 + .../v2/ScramSha512SecuritySchemeTest.kt | 1 + .../SymmetricEncryptionSecuritySchemeTest.kt | 1 + .../v2/UserPasswordSecuritySchemeTest.kt | 1 + .../security/v2/X509SecuritySchemeTest.kt | 1 + .../v2/http/HttpApiKeySecuritySchemeTest.kt | 1 + .../v2/http/HttpSecuritySchemeTest.kt | 1 + .../v2/oauth2/OAuth2SecuritySchemeTest.kt | 3 +- .../security/v2/oauth2/OAuthFlowTest.kt | 1 + .../flow/AuthorizationCodeOAuthFlowTest.kt | 1 + .../flow/ClientCredentialsOAuthFlowTest.kt | 1 + .../v2/oauth2/flow/ImplicitOAuthFlowTest.kt | 1 + .../security/v2/oauth2/flow/OAuthFlowTest.kt | 1 + .../v2/oauth2/flow/PasswordOAuthFlowTest.kt | 1 + .../security/v3/ApiKeySecuritySchemeTest.kt | 2 + .../AsymmetricEncryptionSecuritySchemeTest.kt | 1 + .../security/v3/GssapiSecuritySchemeTest.kt | 1 + .../v3/OpenIdConnectSecuritySchemeTest.kt | 2 + .../security/v3/PlainSecuritySchemeTest.kt | 1 + .../v3/ScramSha256SecuritySchemeTest.kt | 1 + .../v3/ScramSha512SecuritySchemeTest.kt | 1 + .../SymmetricEncryptionSecuritySchemeTest.kt | 1 + .../v3/UserPasswordSecuritySchemeTest.kt | 1 + .../security/v3/X509SecuritySchemeTest.kt | 1 + .../v3/http/HttpApiKeySecuritySchemeTest.kt | 1 + .../v3/http/HttpSecuritySchemeTest.kt | 1 + .../v3/oauth2/OAuth2SecuritySchemeTest.kt | 3 +- .../security/v3/oauth2/OAuthFlowTest.kt | 1 + .../flow/AuthorizationCodeOAuthFlowTest.kt | 1 + .../flow/ClientCredentialsOAuthFlowTest.kt | 1 + .../v3/oauth2/flow/ImplicitOAuthFlowTest.kt | 1 + .../security/v3/oauth2/flow/OAuthFlowTest.kt | 1 + .../v3/oauth2/flow/PasswordOAuthFlowTest.kt | 1 + .../test/kotlin/com/asyncapi/v2/SerDeTest.kt | 2 +- .../asyncapi/v2/_0_0/model/ReferenceTest.kt | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../v2/_0_0/model/channel/ParameterTest.kt | 2 +- .../_0_0/model/channel/message/MessageTest.kt | 10 +- .../model/channel/message/MessageTraitTest.kt | 5 +- .../model/channel/operation/OperationTest.kt | 2 +- .../v2/_0_0/model/component/ComponentsTest.kt | 8 +- .../asyncapi/v2/_6_0/model/AsyncAPITest.kt | 2 +- .../asyncapi/v2/_6_0/model/ReferenceTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 28 ++- .../v2/_6_0/model/channel/ParameterTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 30 ++- .../model/channel/message/MessageTraitTest.kt | 11 +- .../message/MessageWithArrayPayloadTest.kt | 2 +- .../channel/message/OneOfMessagesTest.kt | 2 +- .../model/channel/operation/OperationTest.kt | 18 +- .../channel/operation/OperationTraitTest.kt | 2 +- .../v2/_6_0/model/component/ComponentsTest.kt | 8 +- .../v2/_6_0/model/server/ServerTest.kt | 6 +- .../test/kotlin/com/asyncapi/v3/SerDeTest.kt | 2 +- .../asyncapi/v3/_0_0/model/AsyncAPITest.kt | 2 +- .../asyncapi/v3/_0_0/model/ReferenceTest.kt | 2 +- .../com/asyncapi/v3/_0_0/model/TagTest.kt | 2 +- .../v3/_0_0/model/channel/ChannelTest.kt | 50 +++-- .../_0_0/model/channel/message/MessageTest.kt | 34 +++- .../model/channel/message/MessageTraitTest.kt | 18 +- .../message/MessageWithArrayPayloadTest.kt | 2 +- .../v3/_0_0/model/component/ComponentsTest.kt | 56 +++--- .../asyncapi/v3/_0_0/model/info/InfoTest.kt | 2 +- .../v3/_0_0/model/operation/OperationTest.kt | 18 +- .../model/operation/OperationTraitTest.kt | 2 +- .../operation/reply/OperationReplyTest.kt | 2 +- .../v3/_0_0/model/server/ServerTest.kt | 10 +- 366 files changed, 1330 insertions(+), 1007 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/AsyncAPISchema.java (99%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/ExtendableObject.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/Reference.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/multiformat/AsyncAPIFormatSchema.java (94%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/multiformat/AvroFormatSchema.java (94%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/multiformat/JsonFormatSchema.java (93%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/multiformat/MultiFormatSchema.java (97%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/multiformat/OpenAPIFormatSchema.java (93%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/ApiKeySecurityScheme.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/OpenIdConnectSecurityScheme.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/SecurityScheme.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/http/HttpApiKeySecurityScheme.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/http/HttpSecurityScheme.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/oauth2/OAuth2SecurityScheme.java (89%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/oauth2/OAuthFlows.java (74%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/oauth2/flow/ImplicitOAuthFlow.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/oauth2/flow/OAuthFlow.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v2/oauth2/flow/PasswordOAuthFlow.java (90%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/ApiKeySecurityScheme.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/OpenIdConnectSecurityScheme.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/SecurityScheme.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/http/HttpApiKeySecurityScheme.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/http/HttpSecurityScheme.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/oauth2/OAuth2SecurityScheme.java (90%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/oauth2/OAuthFlows.java (72%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java (92%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/oauth2/flow/ImplicitOAuthFlow.java (91%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/oauth2/flow/OAuthFlow.java (90%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{ => asyncapi}/security/v3/oauth2/flow/PasswordOAuthFlow.java (91%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java index ff6586d0..5cf318f7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index e96a3f0f..a0575f79 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.bindings.sqs.SQSChannelBinding; import com.asyncapi.bindings.stomp.STOMPChannelBinding; import com.asyncapi.bindings.websockets.WebSocketsChannelBinding; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java index 84b178f8..1bf4830a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 52be2cff..5014f537 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.bindings.sqs.SQSMessageBinding; import com.asyncapi.bindings.stomp.STOMPMessageBinding; import com.asyncapi.bindings.websockets.WebSocketsMessageBinding; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java index 560b2f4e..530e057e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index f6bd8938..d2d989b4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.bindings.sqs.SQSOperationBinding; import com.asyncapi.bindings.stomp.STOMPOperationBinding; import com.asyncapi.bindings.websockets.WebSocketsOperationBinding; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java index f6c2fd4d..38092ed2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index e96de0de..7aef1c2b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -19,7 +19,7 @@ import com.asyncapi.bindings.sqs.SQSServerBinding; import com.asyncapi.bindings.stomp.STOMPServerBinding; import com.asyncapi.bindings.websockets.WebSocketsServerBinding; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java index dde6a375..7ea75154 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.anypointmq.v0._0_1.message; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java index 5e1091ea..2eda6553 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._1_0.message; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java index b976702a..6bab3c85 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._1_0.operation; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java index 4aefe413..de565866 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._2_0.message; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java index 2331a6b6..28cf99b7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._2_0.operation; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java index 29c0f983..4a23061f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._3_0.message; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java index 425c4f09..6b96c95a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.http.v0._3_0.operation; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java index 13f87827..2632c266 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.jms.v0._0_1.message; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java index 87218cd8..071bd331 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.kafka.v0._4_0.message; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java index 8d9331eb..d8df88a4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.kafka.v0._4_0.operation; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java index b2e56c43..2f585354 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.websockets.v0._1_0.channel; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java similarity index 99% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java index f16ab125..e893a3c1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/AsyncAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java @@ -1,10 +1,10 @@ -package com.asyncapi.schemas; +package com.asyncapi.schemas.asyncapi; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.schemas.jackson.AsyncAPISchemaAdditionalPropertiesDeserializer; import com.asyncapi.schemas.jackson.AsyncAPISchemaAnyValueDeserializer; import com.asyncapi.schemas.jackson.AsyncAPISchemaItemsDeserializer; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/ExtendableObject.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/ExtendableObject.java index 9b833583..3aa7773e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/ExtendableObject.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/ExtendableObject.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas; +package com.asyncapi.schemas.asyncapi; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/Reference.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/Reference.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/Reference.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/Reference.java index e7c30ec6..17cb8490 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/Reference.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/Reference.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas; +package com.asyncapi.schemas.asyncapi; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AsyncAPIFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AsyncAPIFormatSchema.java similarity index 94% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AsyncAPIFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AsyncAPIFormatSchema.java index 83fa3b0f..d0166596 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AsyncAPIFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AsyncAPIFormatSchema.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.multiformat; +package com.asyncapi.schemas.asyncapi.multiformat; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AvroFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java similarity index 94% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AvroFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java index b36094c6..7647a650 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/AvroFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java @@ -1,7 +1,7 @@ -package com.asyncapi.schemas.multiformat; +package com.asyncapi.schemas.asyncapi.multiformat; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; import com.asyncapi.schemas.avro.v1._9_0.AvroSchemaUnion; import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroSchemaDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/JsonFormatSchema.java similarity index 93% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/JsonFormatSchema.java index 98b00ea6..565b135b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/JsonFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/JsonFormatSchema.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.multiformat; +package com.asyncapi.schemas.asyncapi.multiformat; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.json.JsonSchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/MultiFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/MultiFormatSchema.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/MultiFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/MultiFormatSchema.java index 1fd12a48..68868a9e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/MultiFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/MultiFormatSchema.java @@ -1,8 +1,8 @@ -package com.asyncapi.schemas.multiformat; +package com.asyncapi.schemas.asyncapi.multiformat; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/OpenAPIFormatSchema.java similarity index 93% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/OpenAPIFormatSchema.java index badf8a93..c75dc7bd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/multiformat/OpenAPIFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/OpenAPIFormatSchema.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.multiformat; +package com.asyncapi.schemas.asyncapi.multiformat; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/ApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/ApiKeySecurityScheme.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/ApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/ApiKeySecurityScheme.java index 5e9fddbe..2e24c424 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/ApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/ApiKeySecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.v2; +package com.asyncapi.schemas.asyncapi.security.v2; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/OpenIdConnectSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/OpenIdConnectSecurityScheme.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/OpenIdConnectSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/OpenIdConnectSecurityScheme.java index 762af604..cc48d0e9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/OpenIdConnectSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/OpenIdConnectSecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.v2; +package com.asyncapi.schemas.asyncapi.security.v2; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/SecurityScheme.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/SecurityScheme.java index cdaf7433..591cf51a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/SecurityScheme.java @@ -1,9 +1,9 @@ -package com.asyncapi.schemas.security.v2; +package com.asyncapi.schemas.asyncapi.security.v2; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.security.v2.http.HttpApiKeySecurityScheme; -import com.asyncapi.schemas.security.v2.http.HttpSecurityScheme; -import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.security.v2.http.HttpSecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.http.HttpApiKeySecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/http/HttpApiKeySecurityScheme.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/http/HttpApiKeySecurityScheme.java index 6ab7ece9..3518a078 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/http/HttpApiKeySecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v2.http; +package com.asyncapi.schemas.asyncapi.security.v2.http; -import com.asyncapi.schemas.security.v2.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/http/HttpSecurityScheme.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/http/HttpSecurityScheme.java index 57fcc8d1..9f755132 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/http/HttpSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/http/HttpSecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v2.http; +package com.asyncapi.schemas.asyncapi.security.v2.http; -import com.asyncapi.schemas.security.v2.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuth2SecurityScheme.java similarity index 89% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuth2SecurityScheme.java index 8172ebab..124ab78d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuth2SecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v2.oauth2; +package com.asyncapi.schemas.asyncapi.security.v2.oauth2; -import com.asyncapi.schemas.security.v2.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuthFlows.java similarity index 74% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuthFlows.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuthFlows.java index 78991e1f..e4533cf7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuthFlows.java @@ -1,10 +1,10 @@ -package com.asyncapi.schemas.security.v2.oauth2; +package com.asyncapi.schemas.asyncapi.security.v2.oauth2; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow; -import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow; -import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow; -import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow; +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.PasswordOAuthFlow; +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow; +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ImplicitOAuthFlow; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java index 51652bf5..1e61ee81 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/AuthorizationCodeOAuthFlow.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.v2.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java index 8228df66..b0c63ce9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v2.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/ImplicitOAuthFlow.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/ImplicitOAuthFlow.java index 913af2bb..98ce95c2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/ImplicitOAuthFlow.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v2.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/OAuthFlow.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/OAuthFlow.java index a3296e10..2b19ded0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/OAuthFlow.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v2.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/PasswordOAuthFlow.java similarity index 90% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/PasswordOAuthFlow.java index 27c513f7..cdca7f33 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/flow/PasswordOAuthFlow.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v2.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/ApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/ApiKeySecurityScheme.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/ApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/ApiKeySecurityScheme.java index caa8ad40..253dd6a1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/ApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/ApiKeySecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.v3; +package com.asyncapi.schemas.asyncapi.security.v3; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/OpenIdConnectSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/OpenIdConnectSecurityScheme.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/OpenIdConnectSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/OpenIdConnectSecurityScheme.java index f5db79e3..c6621a17 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/OpenIdConnectSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/OpenIdConnectSecurityScheme.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.security.v3; +package com.asyncapi.schemas.asyncapi.security.v3; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/SecurityScheme.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/SecurityScheme.java index 37d4fafa..cae6ab45 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/SecurityScheme.java @@ -1,9 +1,9 @@ -package com.asyncapi.schemas.security.v3; +package com.asyncapi.schemas.asyncapi.security.v3; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.security.v3.http.HttpApiKeySecurityScheme; -import com.asyncapi.schemas.security.v3.http.HttpSecurityScheme; -import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.security.v3.http.HttpApiKeySecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.http.HttpSecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuth2SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpApiKeySecurityScheme.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpApiKeySecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpApiKeySecurityScheme.java index 1ca9456d..5c811a04 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpApiKeySecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v3.http; +package com.asyncapi.schemas.asyncapi.security.v3.http; -import com.asyncapi.schemas.security.v3.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpSecurityScheme.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpSecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpSecurityScheme.java index a5830273..8df54621 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/http/HttpSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpSecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v3.http; +package com.asyncapi.schemas.asyncapi.security.v3.http; -import com.asyncapi.schemas.security.v3.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuth2SecurityScheme.java similarity index 90% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecurityScheme.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuth2SecurityScheme.java index f52e1c83..391cbb9f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuth2SecurityScheme.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v3.oauth2; +package com.asyncapi.schemas.asyncapi.security.v3.oauth2; -import com.asyncapi.schemas.security.v3.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuthFlows.java similarity index 72% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuthFlows.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuthFlows.java index a19c1a9e..52027a0a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuthFlows.java @@ -1,10 +1,10 @@ -package com.asyncapi.schemas.security.v3.oauth2; +package com.asyncapi.schemas.asyncapi.security.v3.oauth2; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow; -import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow; -import com.asyncapi.schemas.security.v3.oauth2.flow.ImplicitOAuthFlow; -import com.asyncapi.schemas.security.v3.oauth2.flow.PasswordOAuthFlow; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow; +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ClientCredentialsOAuthFlow; +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ImplicitOAuthFlow; +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.PasswordOAuthFlow; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java similarity index 92% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java index b2fce862..b8c5b32a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v3.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java index d1abfb9f..f3c4e65e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v3.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ImplicitOAuthFlow.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ImplicitOAuthFlow.java index 264580c9..cbddcbfd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ImplicitOAuthFlow.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v3.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/OAuthFlow.java similarity index 90% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/OAuthFlow.java index 50be75e2..5c260a3b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/OAuthFlow.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v3.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/PasswordOAuthFlow.java similarity index 91% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlow.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/PasswordOAuthFlow.java index d221e234..b64194b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/PasswordOAuthFlow.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.security.v3.oauth2.flow; +package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java index ac430be4..c2af8a7b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.avro.v1._9_0.jackson; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; import com.asyncapi.schemas.avro.v1._9_0.AvroSchemaUnion; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java index db1ef15f..a83887b1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.jackson; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java index 56bebfc4..cb5c5da3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.jackson; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; /** * AsyncAPI Schema any value deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java index cda637d1..ebdef48e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.jackson; import com.asyncapi.v3.jackson.SchemaItemsDeserializer; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; /** * AsyncAPI Schema items deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java index 7ff5b865..6a525ffd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index fe27cf19..8de1429a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.CorrelationId; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 99cb077b..1de47436 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java index bff68583..157b0bfd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.v2.jackson.ObjectDeserializer; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java index 5e906add..c7a40ce7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java index 137987cb..dfc36526 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.operation; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java index b25cf469..1a2b62b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.channel.operation; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java index 345e9b62..4d233275 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java index 88595306..f5fd4b6b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index 8ead4abf..19c106f0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index 2514fdd6..f1d11ca7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,8 +1,8 @@ package com.asyncapi.v2._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; -import com.asyncapi.schemas.security.v2.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme; /** * Serializes component security schemes map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java index fb1a30a6..d37882ff 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.jackson.model.schema; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java index 517f37de..183bea05 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.model.channel.ChannelItem; import com.asyncapi.v2._0_0.model.component.Components; import com.asyncapi.v2._0_0.model.info.Info; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java index 72859f85..f40dff4a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/ExternalDocumentation.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java index 1205521c..3df58fcf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/Tag.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java index 08a1b5ff..618af41a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/ChannelItem.java @@ -1,8 +1,8 @@ package com.asyncapi.v2._0_0.model.channel; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.ChannelParametersDeserializer; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.operation.Operation; import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.ChannelBindingsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java index e0165b44..e877534a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/Parameter.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model.channel; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java index 341e090f..04445a1e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/CorrelationId.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel.message; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java index 7caebf5e..1268160e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/Message.java @@ -1,14 +1,14 @@ package com.asyncapi.v2._0_0.model.channel.message; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessagePayloadDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageTraitsDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.Tag; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.MessageBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java index c7cf1e69..aa4d7dc1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/message/MessageTrait.java @@ -1,13 +1,13 @@ package com.asyncapi.v2._0_0.model.channel.message; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.MessageBindingsDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java index 79f3f4a0..b0816162 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/Operation.java @@ -1,10 +1,10 @@ package com.asyncapi.v2._0_0.model.channel.operation; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationMessageDeserializer; import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationTraitsDeserializer; import com.asyncapi.v2._0_0.model.ExternalDocumentation; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.bindings.OperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java index 45263475..e48f7c0b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/channel/operation/OperationTrait.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.channel.operation; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.model.ExternalDocumentation; import com.asyncapi.v2._0_0.model.Tag; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java index 119df6a6..de5cdab8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/component/Components.java @@ -1,17 +1,17 @@ package com.asyncapi.v2._0_0.model.component; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsMessagesDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsParametersDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsSchemasDeserializer; import com.asyncapi.v2._0_0.jackson.model.component.ComponentsSecuritySchemesDeserializer; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; import com.asyncapi.v2._0_0.model.channel.message.CorrelationId; import com.asyncapi.v2._0_0.model.channel.message.Message; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.bindings.ChannelBinding; import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.OperationBinding; @@ -20,7 +20,7 @@ import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.bindings.ServerBindingsDeserializer; -import com.asyncapi.schemas.security.v2.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java index 07a3f270..542fcb01 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Contact.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.info; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java index 27e01fbb..93392a7e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/Info.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.info; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java index 066a0398..4ec84e93 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/info/License.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.info; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java index acd0ef94..2de5657b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/Server.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.server; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.bindings.ServerBinding; import com.asyncapi.bindings.ServerBindingsDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java index 88a059d6..9d75835f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/server/ServerVariable.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._0_0.model.server; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java index 618f6aa9..1fdb9bd4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index 1ea3cf91..f032e74a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.CorrelationId; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java index f71f7da3..7997c79a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageDeserializer.java @@ -1,10 +1,10 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; import com.asyncapi.bindings.MessageBindingsDeserializer; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.schemas.json.JsonSchema; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; import com.asyncapi.v2._6_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 8552587d..0c239626 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java index 9e0c350b..97c87410 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.MessageTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java index 0dc5ebc4..12bf3c67 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java index a7808368..c603c6cc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationMessageDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.operation; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java index 0af89c06..2829171a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.channel.operation; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java index efa498fe..06575e8e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.CorrelationId; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java index 0e0d4730..fd30297d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.MessageTrait; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java index 3ba7b850..bb7b28ea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java index 261a1560..1c1064b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java index 4d57c0e2..b0eb2aa3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.Parameter; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java index 8aa12a24..e24fc30e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,8 +1,8 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index b905fe9d..a1d752b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,8 +1,8 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; -import com.asyncapi.schemas.security.v2.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme; public class ComponentsSecuritySchemesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java index 83e48ddf..2c93bfb9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.ServerVariable; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java index 6f6115d6..29c46e6a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.Server; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java index ac8af003..4997801c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.jackson.model.schema; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java index 2f7abe4b..e1fca6f8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.schema; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java index e8c48a15..9034374b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.server; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.ServerVariable; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java index f3d2d4c0..807bceca 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.jackson.model.server; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.Server; import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java index 34a04f44..655b3fbb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.jackson.model.server.ServersDeserializer; import com.asyncapi.v2._6_0.model.channel.ChannelItem; import com.asyncapi.v2._6_0.model.component.Components; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java index 2cb20f77..70f8248e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/ExternalDocumentation.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java index b2046f77..69f4ee51 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Tag.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java index 998b43c9..f5f6873a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model.channel; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.jackson.model.channel.ChannelParametersDeserializer; import com.asyncapi.v2._6_0.model.channel.operation.Operation; import com.asyncapi.bindings.ChannelBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java index f2ab3d97..d97e901d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java @@ -1,7 +1,8 @@ package com.asyncapi.v2._6_0.model.channel; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.v2._6_0.jackson.model.schema.SchemaDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; @@ -37,7 +38,7 @@ public class Parameter extends ExtendableObject { * MUST BE: *
    *
  • {@link Reference}
    • - *
  • {@link com.asyncapi.schemas.AsyncAPISchema}
    • + *
  • {@link AsyncAPISchema}
    • *
*/ @Nullable diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java index c5ab0643..3cf82e4b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java index 9b9511db..b41da3c0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java @@ -2,10 +2,10 @@ import com.asyncapi.bindings.MessageBinding; import com.asyncapi.bindings.MessageBindingsDeserializer; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.schemas.json.JsonSchema; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; import com.asyncapi.v2._6_0.jackson.model.channel.message.*; @@ -89,7 +89,7 @@ public class Message extends ExtendableObject { /** * A string containing the name of the schema format used to define the message payload. - * If omitted, implementations should parse the payload as a {@link com.asyncapi.schemas.AsyncAPISchema} object. When the payload is defined using a + * If omitted, implementations should parse the payload as a {@link AsyncAPISchema} object. When the payload is defined using a * $ref to a remote file, it is RECOMMENDED the schema format includes the file encoding type to allow implementations * to parse the file correctly. E.g., adding +yaml if content type is application/vnd.apache.avro results in * application/vnd.apache.avro+yaml. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java index 296a43fe..04a66349 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageExample.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java index 5f20725a..2cda480b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java @@ -1,9 +1,8 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; @@ -80,7 +79,7 @@ public class MessageTrait extends ExtendableObject { /** * A string containing the name of the schema format used to define the message payload. - * If omitted, implementations should parse the payload as a {@link com.asyncapi.schemas.AsyncAPISchema} object. When the payload is defined using a + * If omitted, implementations should parse the payload as a {@link AsyncAPISchema} object. When the payload is defined using a * $ref to a remote file, it is RECOMMENDED the schema format includes the file encoding type to allow implementations * to parse the file correctly. E.g., adding +yaml if content type is application/vnd.apache.avro results in * application/vnd.apache.avro+yaml. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java index 6f2e46a8..8a7eb3cc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.message; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.jackson.model.channel.message.MessagesDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java index 8a09e510..d9d891c2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.operation; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.jackson.model.channel.operation.OperationMessageDeserializer; import com.asyncapi.v2._6_0.jackson.model.channel.operation.OperationTraitsDeserializer; import com.asyncapi.v2._6_0.model.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java index c574a829..b231ac53 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/OperationTrait.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.operation; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.ExternalDocumentation; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.bindings.OperationBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java index 9c1e0608..d032f645 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/component/Components.java @@ -1,9 +1,9 @@ package com.asyncapi.v2._6_0.model.component; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsCorrelationIdsDeserializer; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsMessageTraitsDeserializer; import com.asyncapi.v2._6_0.jackson.model.component.ComponentsMessagesDeserializer; @@ -22,7 +22,7 @@ import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.bindings.ServerBindingsDeserializer; -import com.asyncapi.schemas.security.v2.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java index cb035bfb..67805e12 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Contact.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.info; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java index b73414ab..c9d54c76 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/Info.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.info; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java index 3f942e8d..21c5cd63 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/info/License.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.info; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java index 11fcacc6..a29f727b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/Server.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model.server; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.jackson.model.server.ServerVariablesDeserializer; import com.asyncapi.v2._6_0.model.Tag; import com.asyncapi.bindings.ServerBinding; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java index 27a2dc54..b63eb655 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/server/ServerVariable.java @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.server; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java index a4d3589e..cc98fdf3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v2.jackson; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java index 7ef73764..2c954d9b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java index 62635cef..b1a733cf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java index 7746101c..63eab13d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Parameter; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java index d2f271e7..849e6160 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Channel; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index 6eb7366b..51d7442f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.CorrelationId; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 305081c7..2fd28c14 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -1,8 +1,8 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java index eb3975ae..f948de77 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -1,8 +1,8 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java index e7e44b8d..f38c5a3b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.MessageTrait; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java index a4b31028..f4beb44d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.channel.message; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.Message; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java index 32bfa332..20d32210 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Channel; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java index b6ea8890..3c8b21cf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.CorrelationId; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java index f17edc60..b4426a0c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java index 257501eb..5a4ee4f5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.MessageTrait; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java index 5b1ab9b0..41b6df7f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.Message; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java index 8fff8798..b2b065b6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.OperationTrait; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java index 284444f9..8e1b96ae 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.Operation; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java index 6e28a9ac..6a6458d8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Parameter; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java index 8799fc34..d9456d15 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java index 30f62875..7896054e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index 33807220..0435e3e8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -1,8 +1,8 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index 7e3776da..0416889e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,8 +1,8 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; -import com.asyncapi.schemas.security.v3.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; public class ComponentsSecuritySchemesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java index 3009a7b5..aa980d0e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.ServerVariable; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java index 835eb49c..d77469a3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.Server; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java index 092488f9..0c36d846 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.component; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java index 3ee3e3af..a715839b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.OperationTrait; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java index 39639b7e..8434e978 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.Operation; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java index 24137817..cda3109c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation.reply; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java index 07fcc46f..966353a0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.operation.reply; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java index 75c71084..b74b5738 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.server; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.ServerVariable; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java index 39caca7f..e0a654e7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.jackson.model.server; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.Server; import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java index 1d083f3f..919049df 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.channel.ChannelsDeserializer; import com.asyncapi.v3._0_0.jackson.model.operation.OperationsDeserializer; import com.asyncapi.v3._0_0.jackson.model.server.ServersDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java index fa44665d..dd07e5d9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/ExternalDocumentation.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java index 963cbf3a..66e083ff 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/Tag.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java index bcaebc7e..bfba7f4c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Channel.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.channel; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessagesDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java index 48f55ab9..446c5279 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/Parameter.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java index fe733262..10b3b0e7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/CorrelationId.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java index dbbce65d..fffcf3a7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/Message.java @@ -1,8 +1,8 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; @@ -12,7 +12,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.bindings.MessageBindingsDeserializer; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java index c23e20a2..00baa026 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageExample.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java index 3a722fc0..63cd6d58 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/channel/message/MessageTrait.java @@ -1,8 +1,8 @@ package com.asyncapi.v3._0_0.model.channel.message; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer; @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.bindings.MessageBindingsDeserializer; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java index a3209237..6346cc45 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/component/Components.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.component; import com.asyncapi.v3._0_0.jackson.model.component.*; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3._0_0.model.channel.Channel; @@ -23,10 +23,10 @@ import com.asyncapi.bindings.MessageBindingsDeserializer; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.bindings.ServerBindingsDeserializer; -import com.asyncapi.schemas.multiformat.MultiFormatSchema; -import com.asyncapi.schemas.AsyncAPISchema; -import com.asyncapi.schemas.security.v3.SecurityScheme; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java index eb1f171d..f1b96d27 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Contact.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java index 99b9f239..af96e261 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/Info.java @@ -1,11 +1,11 @@ package com.asyncapi.v3._0_0.model.info; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java index 02cc6252..ba30d175 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/info/License.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java index 70c18d3c..ca792682 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.jackson.model.operation.OperationTraitsDeserializer; @@ -12,7 +12,7 @@ import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; -import com.asyncapi.schemas.security.v3.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java index be814522..bf7d3cdd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; @@ -9,7 +9,7 @@ import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.OperationBindingsDeserializer; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; -import com.asyncapi.schemas.security.v3.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java index 3dc979ea..7d6520f6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReply.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.operation.reply; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.operation.reply.OperationReplyAddressDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java index c001d846..b9d495b2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyAddress.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation.reply; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java index d9bd36a0..ce2d2686 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java @@ -3,14 +3,14 @@ import com.asyncapi.bindings.ServerBindingsDeserializer; import com.asyncapi.v3._0_0.jackson.model.server.ServerVariablesDeserializer; import com.asyncapi.bindings.ServerBinding; -import com.asyncapi.schemas.ExtendableObject; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.ExtendableObject; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; -import com.asyncapi.schemas.security.v3.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java index c49951b0..06d3a956 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/ServerVariable.java @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.server; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java index ffb1d1d4..53d9ad86 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java @@ -1,8 +1,8 @@ package com.asyncapi.v3.jackson.security_scheme; -import com.asyncapi.schemas.Reference; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; -import com.asyncapi.schemas.security.v3.SecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; /** * Deserializes security schemes. diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java index 072a8c30..afd9074f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/BindingTest.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings; -import com.asyncapi.schemas.ExtendableObject; +import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java index b0467cf5..5000cc6b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/anypointmq/AnypointMQV0_0_1Test.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding; import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java index 14e16b76..fdecf321 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_1_0Test.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationMethod; import com.asyncapi.bindings.http.v0._1_0.operation.HTTPOperationType; import com.asyncapi.bindings.http.v0._1_0.server.HTTPServerBinding; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java index 43d4534e..c33db22a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_2_0Test.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.http.v0._2_0.operation.HTTPOperationBinding; import com.asyncapi.bindings.http.v0._2_0.operation.HTTPOperationMethod; import com.asyncapi.bindings.http.v0._2_0.server.HTTPServerBinding; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java index af600d4d..a7343c53 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/http/HTTPV0_3_0Test.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding; import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod; import com.asyncapi.bindings.http.v0._3_0.server.HTTPServerBinding; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java index 0b658bca..eaf03390 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/jms/JMSV0_1_0Test.java @@ -7,7 +7,7 @@ import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding; import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding; import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerProperty; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java index 634bb61c..e2541d21 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_4_0Test.java @@ -8,7 +8,7 @@ import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageSchemaIdLocation; import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java index 04881665..0462da02 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/websockets/WebSocketsV0_1_0Test.java @@ -6,7 +6,7 @@ import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding; import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding; import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding; -import com.asyncapi.schemas.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.Type; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt index c6b20a96..06aea94c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/AnyOf.kt @@ -1,12 +1,12 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class AnyOf: AbstractExampleValidationTest() { @@ -37,7 +37,8 @@ class AnyOf: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .anyOf(listOf( AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build(), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt index 5183c00f..413032db 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/ApplicationHeaders.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.CorrelationId @@ -11,7 +11,7 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import java.math.BigDecimal class ApplicationHeaders: AbstractExampleValidationTest() { @@ -56,7 +56,7 @@ class ApplicationHeaders: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .publish(Operation.builder() @@ -82,7 +82,8 @@ class ApplicationHeaders: AbstractExampleValidationTest() { "\$message.header#/MQMD/CorrelId" )) .contentType("application/json") - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("MQMD", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt index 184fc791..1c40d5aa 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/CorrelationId.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.CorrelationId @@ -11,15 +11,15 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.ApiKeySecurityScheme -import com.asyncapi.schemas.security.v2.OpenIdConnectSecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.ApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class CorrelationId: AbstractExampleValidationTest() { @@ -71,7 +71,7 @@ class CorrelationId: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .publish(Operation.builder() @@ -85,7 +85,7 @@ class CorrelationId: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/action/{streetlightId}/dim", ChannelItem.builder() .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .subscribe(Operation.builder() @@ -177,10 +177,11 @@ class CorrelationId: AbstractExampleValidationTest() { )) )) .securitySchemes(mapOf( - Pair("apiKey", ApiKeySecurityScheme( - "Provide your API key as the user and leave the password empty.", - ApiKeySecurityScheme.ApiKeyLocation.USER - ) + Pair("apiKey", + ApiKeySecurityScheme( + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) ), Pair("supportedOauthFlows", OAuth2SecurityScheme( @@ -239,10 +240,10 @@ class CorrelationId: AbstractExampleValidationTest() { ) ), Pair("openIdConnectWellKnown", - OpenIdConnectSecurityScheme( - null, - "https://authserver.example/.well-known" - ) + OpenIdConnectSecurityScheme( + null, + "https://authserver.example/.well-known" + ) ) )) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt index 8230e253..439e7589 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/GitterStreaming.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message @@ -10,8 +10,8 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.http.HttpSecurityScheme +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.http.HttpSecurityScheme class GitterStreaming: AbstractExampleValidationTest() { @@ -46,7 +46,8 @@ class GitterStreaming: AbstractExampleValidationTest() { .parameters(mapOf( Pair("roomId", Parameter.builder() .description("Id of the Gitter room.") - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .examples(listOf("53307860c3599d1de448e19d")) .build() @@ -55,7 +56,8 @@ class GitterStreaming: AbstractExampleValidationTest() { ), Pair("resource", Parameter.builder() .description("The resource to consume.") - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("chatMessages", "events")) .build() @@ -93,7 +95,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("chatMessage", Message.builder() .schemaFormat("application/schema+yaml;version=draft-07") .summary("A message represents an individual chat message sent to a room. They are a sub-resource of a room.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("id", AsyncAPISchema.builder() @@ -185,7 +188,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("urls", AsyncAPISchema.builder() .type("array") .description("List of URLs present in the message.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("string") .format("uri") .build()) @@ -194,7 +198,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("mentions", AsyncAPISchema.builder() .type("array") .description("List of @Mentions in the message.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("screenName", AsyncAPISchema.builder() @@ -207,7 +212,8 @@ class GitterStreaming: AbstractExampleValidationTest() { ), Pair("userIds", AsyncAPISchema.builder() .type("array") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("string") .build()) .build() @@ -219,7 +225,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("issues", AsyncAPISchema.builder() .type("array") .description("List of #Issues referenced in the message.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("number", AsyncAPISchema.builder().type("string").build()) @@ -272,7 +279,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("heartbeat", Message.builder() .schemaFormat("application/schema+yaml;version=draft-07") .summary("Its purpose is to keep the connection alive.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("\r\n")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt index 0c2c46e5..37528d3b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Mercure.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter @@ -9,7 +9,7 @@ import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class Mercure: AbstractExampleValidationTest() { @@ -41,7 +41,8 @@ class Mercure: AbstractExampleValidationTest() { .description("Every time a resource of type `http://schema.org/Book` is created or modified, a JSON-LD representation of the new version of this resource must be pushed in this Mercure topic.") .parameters(mapOf( Pair("id", Parameter.builder() - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("integer") .build() ) @@ -70,7 +71,8 @@ class Mercure: AbstractExampleValidationTest() { null, "https://schema.org/Book" )) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("@id", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt index c550a7c3..cd1fdc16 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Not.kt @@ -1,12 +1,12 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class Not: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt index 2c460fa9..95f7f41e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OneOf.kt @@ -1,12 +1,12 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class OneOf: AbstractExampleValidationTest() { @@ -47,7 +47,8 @@ class OneOf: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .oneOf(listOf( AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt index 0321203a..d8954f5f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/OperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod import com.asyncapi.v2._0_0.model.channel.ChannelItem @@ -8,10 +8,10 @@ import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow class OperationSecurity: AbstractExampleValidationTest() { @@ -49,7 +49,8 @@ class OperationSecurity: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("message", Message.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("X-SIGNATURE", AsyncAPISchema.builder() @@ -60,7 +61,8 @@ class OperationSecurity: AbstractExampleValidationTest() { )) .build() ) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("metadata", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt index 51359205..9dcab8e6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcClient.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class RpcClient: AbstractExampleValidationTest() { @@ -46,7 +46,8 @@ class RpcClient: AbstractExampleValidationTest() { Pair("{queue}", ChannelItem.builder() .parameters(mapOf( Pair("queue", Parameter.builder() - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .pattern("^amq\\\\.gen\\\\-.+\$") .build()) @@ -73,7 +74,8 @@ class RpcClient: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("result", AsyncAPISchema.builder() @@ -110,7 +112,8 @@ class RpcClient: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("numbers", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt index a0f0a105..a987b133 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/RpcServer.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class RpcServer: AbstractExampleValidationTest() { @@ -46,7 +46,8 @@ class RpcServer: AbstractExampleValidationTest() { Pair("{queue}", ChannelItem.builder() .parameters(mapOf( Pair("queue", Parameter.builder() - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .pattern("^amq\\\\.gen\\\\-.+\$") .build()) @@ -73,7 +74,8 @@ class RpcServer: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("result", AsyncAPISchema.builder() @@ -104,7 +106,8 @@ class RpcServer: AbstractExampleValidationTest() { .operationId("sum") .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("numbers", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt index d80881a8..f49e60f1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/Simple.kt @@ -1,12 +1,12 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class Simple: AbstractExampleValidationTest() { @@ -38,7 +38,8 @@ class Simple: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("UserSignedUp", Message.builder() - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("displayName", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt index f45c066a..e9c38b85 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/SlackRtm.kt @@ -1,14 +1,14 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.message.Message import com.asyncapi.v2._0_0.model.channel.operation.Operation import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.http.HttpApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.http.HttpApiKeySecurityScheme class SlackRtm: AbstractExampleValidationTest() { @@ -59,11 +59,12 @@ class SlackRtm: AbstractExampleValidationTest() { override fun expectedComponents(): Components? { return Components.builder() .securitySchemes(mapOf( - Pair("token", HttpApiKeySecurityScheme( - null, - "token", - HttpApiKeySecurityScheme.ApiKeyLocation.QUERY - ) + Pair("token", + HttpApiKeySecurityScheme( + null, + "token", + HttpApiKeySecurityScheme.ApiKeyLocation.QUERY + ) ) )) .schemas(mapOf( @@ -112,7 +113,8 @@ class SlackRtm: AbstractExampleValidationTest() { ), Pair("fields", AsyncAPISchema.builder() .type("array") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("title", AsyncAPISchema.builder() @@ -163,7 +165,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("hello", Message.builder() .summary("First event received upon connection.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -179,7 +182,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("connectionError", Message.builder() .summary("Event received when a connection error happens.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -203,7 +207,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("accountsChanged", Message.builder() .summary("The list of accounts a user is signed into has changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -219,7 +224,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("botAdded", Message.builder() .summary("A bot user was added.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -258,7 +264,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("botChanged", Message.builder() .summary("A bot user was changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -297,7 +304,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelArchive", Message.builder() .summary("A channel was archived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -321,7 +329,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelCreated", Message.builder() .summary("A channel was created.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -359,7 +368,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelDeleted", Message.builder() .summary("A channel was deleted.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -379,7 +389,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelHistoryChanged", Message.builder() .summary("Bulk updates were made to a channel's history.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -407,7 +418,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelJoined", Message.builder() .summary("You joined a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -445,7 +457,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelLeft", Message.builder() .summary("You left a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -465,7 +478,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelMarked", Message.builder() .summary("Your channel read marker was updated.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -489,7 +503,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelRename", Message.builder() .summary("A channel was renamed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -523,7 +538,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelUnarchive", Message.builder() .summary("A channel was unarchived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -547,7 +563,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("commandsChanged", Message.builder() .summary("A slash command has been added or changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -567,7 +584,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("dndUpdated", Message.builder() .summary("Do not Disturb settings changed for the current user.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -613,7 +631,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("dndUpdatedUser", Message.builder() .summary("Do not Disturb settings changed for a member.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -651,7 +670,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emailDomainChanged", Message.builder() .summary("The workspace email domain has changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -675,7 +695,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emojiRemoved", Message.builder() .summary("A custom emoji has been removed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -705,7 +726,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emojiAdded", Message.builder() .summary("A custom emoji has been added.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -739,7 +761,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileChange", Message.builder() .summary("A file was changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -766,7 +789,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentAdded", Message.builder() .summary("A file comment was added.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -774,7 +798,9 @@ class SlackRtm: AbstractExampleValidationTest() { .enumValue(listOf("file_comment_added")) .build() ), - Pair("comment", AsyncAPISchema()), + Pair("comment", + AsyncAPISchema() + ), Pair("file_id", AsyncAPISchema.builder() .type("string") .build() @@ -794,7 +820,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentDeleted", Message.builder() .summary("A file comment was deleted.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -825,7 +852,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentEdited", Message.builder() .summary("A file comment was edited.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -833,7 +861,9 @@ class SlackRtm: AbstractExampleValidationTest() { .enumValue(listOf("file_comment_edited")) .build() ), - Pair("comment", AsyncAPISchema()), + Pair("comment", + AsyncAPISchema() + ), Pair("file_id", AsyncAPISchema.builder() .type("string") .build() @@ -853,7 +883,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCreated", Message.builder() .summary("A file was created.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -880,7 +911,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileDeleted", Message.builder() .summary("A file was deleted.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -904,7 +936,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("filePublic", Message.builder() .summary("A file was made public.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -931,7 +964,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileShared", Message.builder() .summary("A file was shared.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -958,7 +992,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileUnshared", Message.builder() .summary("A file was unshared.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -985,7 +1020,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("goodbye", Message.builder() .summary("The server intends to close the connection soon.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1001,7 +1037,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupArchive", Message.builder() .summary("A private channel was archived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1021,7 +1058,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupClose", Message.builder() .summary("You closed a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1045,7 +1083,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupHistoryChanged", Message.builder() .summary("Bulk updates were made to a private channel's history.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1073,7 +1112,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupJoined", Message.builder() .summary("You joined a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1111,7 +1151,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupLeft", Message.builder() .summary("You left a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1131,7 +1172,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupMarked", Message.builder() .summary("A private channel read marker was updated.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1155,7 +1197,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupOpen", Message.builder() .summary("You opened a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1179,7 +1222,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupRename", Message.builder() .summary("A private channel was renamed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1213,7 +1257,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupUnarchive", Message.builder() .summary("A private channel was unarchived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1237,7 +1282,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imClose", Message.builder() .summary("You closed a DM.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1261,7 +1307,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imCreated", Message.builder() .summary("A DM was created.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1303,7 +1350,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imMarked", Message.builder() .summary("A direct message read marker was updated.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1327,7 +1375,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imOpen", Message.builder() .summary("You opened a DM.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1351,7 +1400,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("manualPresenceChange", Message.builder() .summary("You manually updated your presence.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1371,7 +1421,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("memberJoinedChannel", Message.builder() .summary("A user joined a public or private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1408,7 +1459,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("memberLeftChannel", Message.builder() .summary("A user left a public or private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1441,7 +1493,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("message", Message.builder() .summary("A message was sent to a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1492,7 +1545,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("outgoingMessage", Message.builder() .summary("A message was sent to a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt index 93ad8d81..8fdbdeac 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message @@ -12,8 +12,8 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.SecurityScheme +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -66,7 +66,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") @@ -79,7 +79,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOn") @@ -91,7 +91,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOff") @@ -103,7 +103,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.dim", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("dimLight") @@ -216,10 +216,10 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .build() ), Pair("certs", - SecurityScheme( - SecurityScheme.Type.X509, - "Download the certificate files from service provider" - ) + SecurityScheme( + SecurityScheme.Type.X509, + "Download the certificate files from service provider" + ) ) )) .parameters(mapOf( @@ -232,7 +232,8 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("my-app-header", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt index d4b26b30..69e52534 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message @@ -13,15 +13,15 @@ import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.ApiKeySecurityScheme -import com.asyncapi.schemas.security.v2.OpenIdConnectSecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.ApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class StreetlightsMQTT: AbstractExampleValidationTest() { @@ -81,7 +81,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") @@ -94,7 +94,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/action/{streetlightId}/turn/on", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOn") @@ -106,7 +106,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/action/{streetlightId}/turn/off", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOff") @@ -118,7 +118,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/action/{streetlightId}/dim", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("dimLight") @@ -225,10 +225,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { )) .securitySchemes(mapOf( Pair("apiKey", - ApiKeySecurityScheme( - "Provide your API key as the user and leave the password empty.", - ApiKeySecurityScheme.ApiKeyLocation.USER - ) + ApiKeySecurityScheme( + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) ), Pair("supportedOauthFlows", OAuth2SecurityScheme( @@ -287,10 +287,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ) ), Pair("openIdConnectWellKnown", - OpenIdConnectSecurityScheme( - null, - "https://authserver.example/.well-known" - ) + OpenIdConnectSecurityScheme( + null, + "https://authserver.example/.well-known" + ) ) )) .parameters(mapOf( @@ -303,7 +303,8 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("my-app-header", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt index ba9facde..36329481 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message @@ -12,11 +12,11 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -72,7 +72,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") @@ -85,7 +85,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOn") @@ -97,7 +97,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOff") @@ -110,7 +110,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.dim", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("dimLight") @@ -258,7 +258,8 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("my-app-header", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt index 66f54de1..fb58138f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/WebsocketGemini.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItem import com.asyncapi.v2._0_0.model.channel.Parameter import com.asyncapi.v2._0_0.model.channel.message.Message @@ -10,7 +10,7 @@ import com.asyncapi.v2._0_0.model.info.Contact import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class WebsocketGemini: AbstractExampleValidationTest() { @@ -51,7 +51,8 @@ class WebsocketGemini: AbstractExampleValidationTest() { mapOf( Pair("symbol", Parameter.builder() - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .enumValue(listOf( "btcusd", @@ -338,7 +339,8 @@ class WebsocketGemini: AbstractExampleValidationTest() { Pair("events", AsyncAPISchema.builder() .type("array") .description("Either a change to the order book, or the indication that a trade has occurred.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .additionalProperties(false) .properties(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt index 5924dcba..8e7f9652 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/AnyOf.kt @@ -1,12 +1,12 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class AnyOf: AbstractExampleValidationTest() { @@ -37,7 +37,8 @@ class AnyOf: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .anyOf(listOf( AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build(), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt index df71b7d2..2d6c13f6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/ApplicationHeaders.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.CorrelationId @@ -11,7 +11,7 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import java.math.BigDecimal class ApplicationHeaders: AbstractExampleValidationTest() { @@ -56,7 +56,7 @@ class ApplicationHeaders: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .publish(Operation.builder() @@ -82,7 +82,8 @@ class ApplicationHeaders: AbstractExampleValidationTest() { "\$message.header#/MQMD/CorrelId" )) .contentType("application/json") - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("MQMD", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt index ca948e8b..2ef91d97 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/CorrelationId.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.CorrelationId @@ -11,15 +11,15 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.ApiKeySecurityScheme -import com.asyncapi.schemas.security.v2.OpenIdConnectSecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.ApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class CorrelationId: AbstractExampleValidationTest() { @@ -71,7 +71,7 @@ class CorrelationId: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured", ChannelItem.builder() .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .publish(Operation.builder() @@ -85,7 +85,7 @@ class CorrelationId: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/action/{streetlightId}/dim", ChannelItem.builder() .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .subscribe(Operation.builder() @@ -177,10 +177,11 @@ class CorrelationId: AbstractExampleValidationTest() { )) )) .securitySchemes(mapOf( - Pair("apiKey", ApiKeySecurityScheme( - "Provide your API key as the user and leave the password empty.", - ApiKeySecurityScheme.ApiKeyLocation.USER - ) + Pair("apiKey", + ApiKeySecurityScheme( + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) ), Pair("supportedOauthFlows", OAuth2SecurityScheme( @@ -239,10 +240,10 @@ class CorrelationId: AbstractExampleValidationTest() { ) ), Pair("openIdConnectWellKnown", - OpenIdConnectSecurityScheme( - null, - "https://authserver.example/.well-known" - ) + OpenIdConnectSecurityScheme( + null, + "https://authserver.example/.well-known" + ) ) )) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt index 7c36ae7f..42709d1e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/GitterStreaming.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.Message @@ -11,8 +11,8 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.http.HttpSecurityScheme +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.http.HttpSecurityScheme class GitterStreaming: AbstractExampleValidationTest() { @@ -47,7 +47,8 @@ class GitterStreaming: AbstractExampleValidationTest() { .parameters(mapOf( Pair("roomId", Parameter.builder() .description("Id of the Gitter room.") - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .examples(listOf("53307860c3599d1de448e19d")) .build() @@ -56,7 +57,8 @@ class GitterStreaming: AbstractExampleValidationTest() { ), Pair("resource", Parameter.builder() .description("The resource to consume.") - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("chatMessages", "events")) .build() @@ -96,7 +98,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("chatMessage", Message.builder() .schemaFormat("application/vnd.aai.asyncapi+yaml;version=2.6.0") .summary("A message represents an individual chat message sent to a room. They are a sub-resource of a room.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("id", AsyncAPISchema.builder() @@ -188,7 +191,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("urls", AsyncAPISchema.builder() .type("array") .description("List of URLs present in the message.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("string") .format("uri") .build()) @@ -197,7 +201,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("mentions", AsyncAPISchema.builder() .type("array") .description("List of @Mentions in the message.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("screenName", AsyncAPISchema.builder() @@ -210,7 +215,8 @@ class GitterStreaming: AbstractExampleValidationTest() { ), Pair("userIds", AsyncAPISchema.builder() .type("array") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("string") .build()) .build() @@ -222,7 +228,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("issues", AsyncAPISchema.builder() .type("array") .description("List of #Issues referenced in the message.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("number", AsyncAPISchema.builder().type("string").build()) @@ -259,7 +266,8 @@ class GitterStreaming: AbstractExampleValidationTest() { Pair("heartbeat", Message.builder() .schemaFormat("application/vnd.aai.asyncapi+yaml;version=2.6.0") .summary("Its purpose is to keep the connection alive.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("string") .enumValue(listOf("\r\n")) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt index 1934c7fe..7a2772f4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Mercure.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter @@ -9,7 +9,7 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class Mercure: AbstractExampleValidationTest() { @@ -41,7 +41,8 @@ class Mercure: AbstractExampleValidationTest() { .description("Every time a resource of type `http://schema.org/Book` is created or modified, a JSON-LD representation of the new version of this resource must be pushed in this Mercure topic.") .parameters(mapOf( Pair("id", Parameter.builder() - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("integer") .build() ) @@ -70,7 +71,8 @@ class Mercure: AbstractExampleValidationTest() { null, "https://schema.org/Book" )) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("@id", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt index 95079726..0ffe615e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Not.kt @@ -1,12 +1,12 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class Not: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt index 616c7abc..95fe8434 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OneOf.kt @@ -1,13 +1,13 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class OneOf: AbstractExampleValidationTest() { @@ -52,7 +52,8 @@ class OneOf: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("testMessages", Message.builder() - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .oneOf(listOf( AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey").build(), AsyncAPISchema.builder().ref("#/components/schemas/objectWithKey2").build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt index d603cb91..1c384e0a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/OperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation @@ -8,10 +8,10 @@ import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow class OperationSecurity: AbstractExampleValidationTest() { @@ -54,7 +54,8 @@ class OperationSecurity: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("message", Message.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("X-SIGNATURE", AsyncAPISchema.builder() @@ -65,7 +66,8 @@ class OperationSecurity: AbstractExampleValidationTest() { )) .build() ) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("metadata", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt index d295b8f0..15c85326 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcClient.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class RpcClient: AbstractExampleValidationTest() { @@ -46,7 +46,8 @@ class RpcClient: AbstractExampleValidationTest() { Pair("{queue}", ChannelItem.builder() .parameters(mapOf( Pair("queue", Parameter.builder() - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .pattern("^amq\\\\.gen\\\\-.+\$") .build()) @@ -73,7 +74,8 @@ class RpcClient: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("result", AsyncAPISchema.builder() @@ -110,7 +112,8 @@ class RpcClient: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("numbers", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt index 30308bef..14e767d2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/RpcServer.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class RpcServer: AbstractExampleValidationTest() { @@ -46,7 +46,8 @@ class RpcServer: AbstractExampleValidationTest() { Pair("{queue}", ChannelItem.builder() .parameters(mapOf( Pair("queue", Parameter.builder() - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .pattern("^amq\\\\.gen\\\\-.+\$") .build()) @@ -73,7 +74,8 @@ class RpcServer: AbstractExampleValidationTest() { )) .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("result", AsyncAPISchema.builder() @@ -104,7 +106,8 @@ class RpcServer: AbstractExampleValidationTest() { .operationId("sum") .message(Message.builder() .correlationId(CorrelationId(null, "\$message.header#/correlation_id")) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("numbers", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt index 853d7197..e5026761 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAsyncAPIPayload.kt @@ -1,7 +1,7 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation @@ -53,7 +53,8 @@ class SchemaFormatAsyncAPIPayload: AbstractExampleValidationTest() { .summary("Product representing items in inventory") .contentType("application/json") .schemaFormat("application/vnd.aai.asyncapi+json;version=2.6.0") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .id("https://example.com/person.schema.json") .schema("http://json-schema.org/draft-07/schema#") .title("Person") diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAvroPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAvroPayload.kt index 97a6b45d..78d7d4c9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAvroPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatAvroPayload.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.schemas.avro.v1._9_0.* import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt index 7f7d0e85..67a7d025 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatJsonSchemaPayload.kt @@ -1,7 +1,7 @@ package com.asyncapi.examples.v2._6_0 import com.asyncapi.schemas.json.JsonSchema -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatOpenAPIPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatOpenAPIPayload.kt index 041c5cdd..3d3518ed 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatOpenAPIPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatOpenAPIPayload.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAsyncAPIPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAsyncAPIPayload.kt index f6535680..88585553 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAsyncAPIPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAsyncAPIPayload.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAvroPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAvroPayload.kt index 0d66720f..450c6032 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAvroPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToAvroPayload.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToJsonSchemaPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToJsonSchemaPayload.kt index 6f2762e8..0ac8084c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToJsonSchemaPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToJsonSchemaPayload.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToOpenAPIPayload.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToOpenAPIPayload.kt index b6caa2c2..cf123d64 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToOpenAPIPayload.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SchemaFormatReferenceToOpenAPIPayload.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.CorrelationId import com.asyncapi.v2._6_0.model.channel.message.Message diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt index 0ae322d6..70277cd4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/Simple.kt @@ -1,12 +1,12 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class Simple: AbstractExampleValidationTest() { @@ -38,7 +38,8 @@ class Simple: AbstractExampleValidationTest() { return Components.builder() .messages(mapOf( Pair("UserSignedUp", Message.builder() - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("displayName", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt index d24527e3..27ad7be8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/SlackRtm.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.message.Message import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages @@ -8,8 +8,8 @@ import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.http.HttpApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.http.HttpApiKeySecurityScheme class SlackRtm: AbstractExampleValidationTest() { @@ -106,11 +106,12 @@ class SlackRtm: AbstractExampleValidationTest() { override fun expectedComponents(): Components? { return Components.builder() .securitySchemes(mapOf( - Pair("token", HttpApiKeySecurityScheme( - null, - "token", - HttpApiKeySecurityScheme.ApiKeyLocation.QUERY - ) + Pair("token", + HttpApiKeySecurityScheme( + null, + "token", + HttpApiKeySecurityScheme.ApiKeyLocation.QUERY + ) ) )) .schemas(mapOf( @@ -159,7 +160,8 @@ class SlackRtm: AbstractExampleValidationTest() { ), Pair("fields", AsyncAPISchema.builder() .type("array") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("title", AsyncAPISchema.builder() @@ -210,7 +212,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("hello", Message.builder() .summary("First event received upon connection.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -226,7 +229,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("connectionError", Message.builder() .summary("Event received when a connection error happens.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -250,7 +254,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("accountsChanged", Message.builder() .summary("The list of accounts a user is signed into has changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -266,7 +271,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("botAdded", Message.builder() .summary("A bot user was added.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -305,7 +311,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("botChanged", Message.builder() .summary("A bot user was changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -344,7 +351,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelArchive", Message.builder() .summary("A channel was archived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -368,7 +376,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelCreated", Message.builder() .summary("A channel was created.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -406,7 +415,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelDeleted", Message.builder() .summary("A channel was deleted.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -426,7 +436,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelHistoryChanged", Message.builder() .summary("Bulk updates were made to a channel's history.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -454,7 +465,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelJoined", Message.builder() .summary("You joined a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -492,7 +504,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelLeft", Message.builder() .summary("You left a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -512,7 +525,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelMarked", Message.builder() .summary("Your channel read marker was updated.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -536,7 +550,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelRename", Message.builder() .summary("A channel was renamed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -570,7 +585,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("channelUnarchive", Message.builder() .summary("A channel was unarchived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -594,7 +610,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("commandsChanged", Message.builder() .summary("A slash command has been added or changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -614,7 +631,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("dndUpdated", Message.builder() .summary("Do not Disturb settings changed for the current user.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -660,7 +678,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("dndUpdatedUser", Message.builder() .summary("Do not Disturb settings changed for a member.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -698,7 +717,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emailDomainChanged", Message.builder() .summary("The workspace email domain has changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -722,7 +742,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emojiRemoved", Message.builder() .summary("A custom emoji has been removed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -752,7 +773,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("emojiAdded", Message.builder() .summary("A custom emoji has been added.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -786,7 +808,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileChange", Message.builder() .summary("A file was changed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -813,7 +836,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentAdded", Message.builder() .summary("A file comment was added.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -821,7 +845,9 @@ class SlackRtm: AbstractExampleValidationTest() { .enumValue(listOf("file_comment_added")) .build() ), - Pair("comment", AsyncAPISchema()), + Pair("comment", + AsyncAPISchema() + ), Pair("file_id", AsyncAPISchema.builder() .type("string") .build() @@ -841,7 +867,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentDeleted", Message.builder() .summary("A file comment was deleted.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -872,7 +899,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCommentEdited", Message.builder() .summary("A file comment was edited.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -880,7 +908,9 @@ class SlackRtm: AbstractExampleValidationTest() { .enumValue(listOf("file_comment_edited")) .build() ), - Pair("comment", AsyncAPISchema()), + Pair("comment", + AsyncAPISchema() + ), Pair("file_id", AsyncAPISchema.builder() .type("string") .build() @@ -900,7 +930,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileCreated", Message.builder() .summary("A file was created.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -927,7 +958,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileDeleted", Message.builder() .summary("A file was deleted.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -951,7 +983,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("filePublic", Message.builder() .summary("A file was made public.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -978,7 +1011,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileShared", Message.builder() .summary("A file was shared.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1005,7 +1039,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("fileUnshared", Message.builder() .summary("A file was unshared.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1032,7 +1067,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("goodbye", Message.builder() .summary("The server intends to close the connection soon.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1048,7 +1084,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupArchive", Message.builder() .summary("A private channel was archived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1068,7 +1105,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupClose", Message.builder() .summary("You closed a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1092,7 +1130,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupHistoryChanged", Message.builder() .summary("Bulk updates were made to a private channel's history.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1120,7 +1159,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupJoined", Message.builder() .summary("You joined a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1158,7 +1198,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupLeft", Message.builder() .summary("You left a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1178,7 +1219,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupMarked", Message.builder() .summary("A private channel read marker was updated.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1202,7 +1244,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupOpen", Message.builder() .summary("You opened a private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1226,7 +1269,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupRename", Message.builder() .summary("A private channel was renamed.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1260,7 +1304,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("groupUnarchive", Message.builder() .summary("A private channel was unarchived.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1284,7 +1329,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imClose", Message.builder() .summary("You closed a DM.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1308,7 +1354,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imCreated", Message.builder() .summary("A DM was created.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1350,7 +1397,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imMarked", Message.builder() .summary("A direct message read marker was updated.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1374,7 +1422,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("imOpen", Message.builder() .summary("You opened a DM.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1398,7 +1447,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("manualPresenceChange", Message.builder() .summary("You manually updated your presence.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1418,7 +1468,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("memberJoinedChannel", Message.builder() .summary("A user joined a public or private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1455,7 +1506,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("memberLeftChannel", Message.builder() .summary("A user left a public or private channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1488,7 +1540,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("message", Message.builder() .summary("A message was sent to a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() @@ -1539,7 +1592,8 @@ class SlackRtm: AbstractExampleValidationTest() { Pair("outgoingMessage", Message.builder() .summary("A message was sent to a channel.") - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("type", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt index dcd7bf6a..a20c1a06 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter @@ -13,8 +13,8 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.SecurityScheme +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import java.math.BigDecimal class StreetlightsKafka: AbstractExampleValidationTest() { @@ -95,7 +95,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") @@ -108,7 +108,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOn") @@ -120,7 +120,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOff") @@ -132,7 +132,7 @@ class StreetlightsKafka: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.dim", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("dimLight") @@ -245,10 +245,10 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .build() ), Pair("certs", - SecurityScheme( - SecurityScheme.Type.X509, - "Download the certificate files from service provider" - ) + SecurityScheme( + SecurityScheme.Type.X509, + "Download the certificate files from service provider" + ) ) )) .parameters(mapOf( @@ -261,7 +261,8 @@ class StreetlightsKafka: AbstractExampleValidationTest() { .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("my-app-header", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt index af4da8eb..97b1c6ae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter @@ -14,15 +14,15 @@ import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.ApiKeySecurityScheme -import com.asyncapi.schemas.security.v2.OpenIdConnectSecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.schemas.security.v2.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.ApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class StreetlightsMQTT: AbstractExampleValidationTest() { @@ -87,7 +87,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") @@ -100,7 +100,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/action/{streetlightId}/turn/on", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOn") @@ -112,7 +112,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/action/{streetlightId}/turn/off", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOff") @@ -124,7 +124,7 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { Pair("smartylighting/streetlights/1/0/action/{streetlightId}/dim", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("dimLight") @@ -231,10 +231,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { )) .securitySchemes(mapOf( Pair("apiKey", - ApiKeySecurityScheme( - "Provide your API key as the user and leave the password empty.", - ApiKeySecurityScheme.ApiKeyLocation.USER - ) + ApiKeySecurityScheme( + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) ), Pair("supportedOauthFlows", OAuth2SecurityScheme( @@ -293,10 +293,10 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { ) ), Pair("openIdConnectWellKnown", - OpenIdConnectSecurityScheme( - null, - "https://authserver.example/.well-known" - ) + OpenIdConnectSecurityScheme( + null, + "https://authserver.example/.well-known" + ) ) )) .parameters(mapOf( @@ -309,7 +309,8 @@ class StreetlightsMQTT: AbstractExampleValidationTest() { .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("my-app-header", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt index e88d09a7..1c52bd83 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.Parameter import com.asyncapi.v2._6_0.model.channel.message.Message @@ -12,11 +12,11 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v2.SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v2.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v2.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow import java.math.BigDecimal class StreetlightsOperationSecurity: AbstractExampleValidationTest() { @@ -72,7 +72,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { ChannelItem.builder() .description("The topic on which measured values may be produced and consumed.") .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .publish(Operation.builder() .operationId("receiveLightMeasurement") @@ -86,7 +86,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOn") @@ -100,7 +100,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("turnOff") @@ -115,7 +115,7 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { Pair("smartylighting.streetlights.1.0.action.{streetlightId}.dim", ChannelItem.builder() .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .subscribe(Operation.builder() .operationId("dimLight") @@ -265,7 +265,8 @@ class StreetlightsOperationSecurity: AbstractExampleValidationTest() { .messageTraits(mapOf( Pair("commonHeaders", MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair("my-app-header", AsyncAPISchema.builder() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt index 82359b67..b7717af1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/WebsocketGemini.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v2._6_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._6_0.model.channel.ChannelItem import com.asyncapi.v2._6_0.model.channel.operation.Operation import com.asyncapi.v2._6_0.model.channel.Parameter @@ -11,7 +11,7 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.Contact import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class WebsocketGemini: AbstractExampleValidationTest() { @@ -52,7 +52,8 @@ class WebsocketGemini: AbstractExampleValidationTest() { mapOf( Pair("symbol", Parameter.builder() - .schema(AsyncAPISchema.builder() + .schema( + AsyncAPISchema.builder() .type("string") .enumValue(listOf( "btcusd", @@ -339,7 +340,8 @@ class WebsocketGemini: AbstractExampleValidationTest() { Pair("events", AsyncAPISchema.builder() .type("array") .description("Either a change to the order book, or the indication that a trade has occurred.") - .items(AsyncAPISchema.builder() + .items( + AsyncAPISchema.builder() .type("object") .additionalProperties(false) .properties(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt index 411e9c00..34dc9264 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -19,9 +19,9 @@ import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicCleanupPolic import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguration import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.multiformat.AvroFormatSchema -import com.asyncapi.schemas.security.v3.SecurityScheme +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { @@ -118,10 +118,10 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { ) .parameters(mapOf( Pair("env", - Reference("#/components/parameters/Env") + Reference("#/components/parameters/Env") ), Pair("version", - Reference("#/components/parameters/Version") + Reference("#/components/parameters/Version") ) )) .bindings(mapOf( @@ -138,7 +138,7 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { )) .messages(mapOf( Pair("CostingRequest", - Reference("#/components/messages/costingRequestV1") + Reference("#/components/messages/costingRequestV1") ) )) .build() @@ -166,7 +166,7 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { .tags(listOf(Tag.builder().name("costing").build())) .messages(mapOf( Pair("costingResponse", - Reference("#/components/messages/costingResponse") + Reference("#/components/messages/costingResponse") ) )) .build() @@ -216,10 +216,10 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { override fun expectedComponents(): Components? { val saslSslSecurityScheme = SecurityScheme( - SecurityScheme.Type.PLAIN, - "Use [SASL authentication with SSL " + - "encryption](https://docs.confluent.io/platform/current/security/security_tutorial.html#configure-clients) " + - "to connect to the ADEO Broker." + SecurityScheme.Type.PLAIN, + "Use [SASL authentication with SSL " + + "encryption](https://docs.confluent.io/platform/current/security/security_tutorial.html#configure-clients) " + + "to connect to the ADEO Broker." ) saslSslSecurityScheme.extensionFields = mapOf( Pair("x-sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required " + @@ -262,10 +262,10 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { .build() ) .payload( - AvroFormatSchema( - "application/vnd.apache.avro;version=1.9.0", - Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingRequestPayload.avsc") - ) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingRequestPayload.avsc") + ) ) .build() ), @@ -301,10 +301,10 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() { .build() ) .payload( - AvroFormatSchema( - "application/vnd.apache.avro;version=1.9.0", - Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingResponsePayload.avsc") - ) + AvroFormatSchema( + "application/vnd.apache.avro;version=1.9.0", + Reference("https://www.asyncapi.com/resources/casestudies/adeo/CostingResponsePayload.avsc") + ) ) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt index 979cf96a..0ff5a5d6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AnyOfAsyncAPI.kt @@ -1,13 +1,13 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class AnyOfAsyncAPI: AbstractExampleValidationTest() { override fun specificationLocation(): String = "/examples/v3.0.0/anyof-asyncapi.yml" diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt index 568a2d36..01050e4f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/ApplicationHeadersAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId @@ -12,7 +12,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import java.math.BigDecimal class ApplicationHeadersAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt index df99b327..385d9a65 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/CorrelationIdAsyncAPI.kt @@ -1,7 +1,7 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.security.v3.ApiKeySecurityScheme -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.security.v3.ApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId @@ -13,14 +13,14 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v3.OpenIdConnectSecurityScheme -import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v3.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.security.v3.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.schemas.security.v3.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v3.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { @@ -56,7 +56,7 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { ) )) .security(listOf( - Reference("#/components/securitySchemes/apiKey"), + Reference("#/components/securitySchemes/apiKey"), OAuth2SecurityScheme( "Flows to support OAuth 2.0", OAuthFlows( @@ -140,7 +140,7 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { "streetlights:dim", ), ), - Reference("#/components/securitySchemes/openIdConnectWellKnown"), + Reference("#/components/securitySchemes/openIdConnectWellKnown"), )) .build() ) @@ -154,12 +154,12 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { .address("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured") .messages(mapOf( Pair("lightMeasured", - Reference("#/components/messages/lightMeasured") + Reference("#/components/messages/lightMeasured") ) )) .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .build() @@ -169,12 +169,12 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { .address("smartylighting/streetlights/1/0/action/{streetlightId}/dim") .messages(mapOf( Pair("dimLight", - Reference("#/components/messages/dimLight") + Reference("#/components/messages/dimLight") ) )) .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .build() @@ -190,7 +190,7 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { .channel(Reference("#/channels/lightingMeasured")) .summary("Inform about environmental lighting conditions of a particular streetlight.") .messages(listOf( - Reference("#/channels/lightingMeasured/messages/lightMeasured") + Reference("#/channels/lightingMeasured/messages/lightMeasured") )) .build() ), @@ -199,7 +199,7 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { .action(OperationAction.SEND) .channel(Reference("#/channels/lightsDim")) .messages(listOf( - Reference("#/channels/lightsDim/messages/dimLight") + Reference("#/channels/lightsDim/messages/dimLight") )) .build() ) @@ -289,10 +289,11 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { ) )) .securitySchemes(mapOf( - Pair("apiKey", ApiKeySecurityScheme( - "Provide your API key as the user and leave the password empty.", - ApiKeySecurityScheme.ApiKeyLocation.USER - ) + Pair("apiKey", + ApiKeySecurityScheme( + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) ), Pair("supportedOauthFlows", OAuth2SecurityScheme( @@ -352,11 +353,11 @@ class CorrelationIdAsyncAPI: AbstractExampleValidationTest() { ) ), Pair("openIdConnectWellKnown", - OpenIdConnectSecurityScheme( - null, - "https://authserver.example/.well-known", - null - ) + OpenIdConnectSecurityScheme( + null, + "https://authserver.example/.well-known", + null + ) ), )) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt index d96c3557..80b338dc 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/GitterStreamingAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.bindings.http.v0._3_0.message.HTTPMessageBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod @@ -12,10 +12,10 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema -import com.asyncapi.schemas.multiformat.JsonFormatSchema -import com.asyncapi.schemas.security.v3.http.HttpSecurityScheme +import com.asyncapi.schemas.asyncapi.multiformat.JsonFormatSchema +import com.asyncapi.schemas.asyncapi.security.v3.http.HttpSecurityScheme class GitterStreamingAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt index 6f828882..e7566472 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.CorrelationId import com.asyncapi.v3._0_0.model.channel.message.Message @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.reply.OperationReply -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleValidationTest() { @@ -46,28 +46,28 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa .address("/") .messages(mapOf( Pair("ping", - Reference("#/components/messages/ping") + Reference("#/components/messages/ping") ), Pair("pong", - Reference("#/components/messages/pong") + Reference("#/components/messages/pong") ), Pair("heartbeat", - Reference("#/components/messages/heartbeat") + Reference("#/components/messages/heartbeat") ), Pair("systemStatus", - Reference("#/components/messages/systemStatus") + Reference("#/components/messages/systemStatus") ), Pair("subscriptionStatus", - Reference("#/components/messages/subscriptionStatus") + Reference("#/components/messages/subscriptionStatus") ), Pair("subscribe", - Reference("#/components/messages/subscribe") + Reference("#/components/messages/subscribe") ), Pair("unsubscribe", - Reference("#/components/messages/unsubscribe") + Reference("#/components/messages/unsubscribe") ), Pair("dummyCurrencyInfo", - Reference("#/components/messages/dummyCurrencyInfo") + Reference("#/components/messages/dummyCurrencyInfo") ), )) .build() @@ -82,7 +82,7 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa .channel(Reference("#/channels/currencyExchange")) .reply(OperationReply( null, - Reference("#/channels/currencyExchange"), + Reference("#/channels/currencyExchange"), listOf(Reference("#/channels/currencyExchange/messages/pong")) )) .messages(listOf(Reference("#/channels/currencyExchange/messages/ping"))) @@ -105,10 +105,10 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa .channel(Reference("#/channels/currencyExchange")) .reply(OperationReply( null, - Reference("#/channels/currencyExchange"), + Reference("#/channels/currencyExchange"), listOf( - Reference("#/channels/currencyExchange/messages/subscriptionStatus"), - Reference("#/channels/currencyExchange/messages/dummyCurrencyInfo") + Reference("#/channels/currencyExchange/messages/subscriptionStatus"), + Reference("#/channels/currencyExchange/messages/dummyCurrencyInfo") ) )) .messages(listOf(Reference("#/channels/currencyExchange/messages/subscribe"))) @@ -119,9 +119,9 @@ class KrakenWebsocketRequestReplyMessageFilterInReplyAsyncAPI: AbstractExampleVa .channel(Reference("#/channels/currencyExchange")) .reply(OperationReply( null, - Reference("#/channels/currencyExchange"), + Reference("#/channels/currencyExchange"), listOf( - Reference("#/channels/currencyExchange/messages/subscriptionStatus") + Reference("#/channels/currencyExchange/messages/subscriptionStatus") ) )) .messages(listOf(Reference("#/channels/currencyExchange/messages/unsubscribe"))) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt index 89f133aa..661f1416 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.CorrelationId import com.asyncapi.v3._0_0.model.channel.message.Message @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.reply.OperationReply -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValidationTest() { @@ -46,7 +46,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .address("/") .messages(mapOf( Pair("ping", - Reference("#/components/messages/ping") + Reference("#/components/messages/ping") ), )) .build() @@ -56,7 +56,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .address("/") .messages(mapOf( Pair("pong", - Reference("#/components/messages/pong") + Reference("#/components/messages/pong") ), )) .build() @@ -66,7 +66,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .address("/") .messages(mapOf( Pair("heartbeat", - Reference("#/components/messages/heartbeat") + Reference("#/components/messages/heartbeat") ), )) .build() @@ -76,7 +76,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .address("/") .messages(mapOf( Pair("systemStatus", - Reference("#/components/messages/systemStatus") + Reference("#/components/messages/systemStatus") ), )) .build() @@ -86,10 +86,10 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .address("/") .messages(mapOf( Pair("subscriptionStatus", - Reference("#/components/messages/subscriptionStatus") + Reference("#/components/messages/subscriptionStatus") ), Pair("dummyCurrencyInfo", - Reference("#/components/messages/dummyCurrencyInfo") + Reference("#/components/messages/dummyCurrencyInfo") ), )) .build() @@ -99,7 +99,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .address("/") .messages(mapOf( Pair("subscribe", - Reference("#/components/messages/subscribe") + Reference("#/components/messages/subscribe") ), )) .build() @@ -109,7 +109,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .address("/") .messages(mapOf( Pair("unsubscribe", - Reference("#/components/messages/unsubscribe") + Reference("#/components/messages/unsubscribe") ), )) .build() @@ -124,7 +124,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .channel(Reference("#/channels/ping")) .reply(OperationReply( null, - Reference("#/channels/pong"), + Reference("#/channels/pong"), null )) .build() @@ -144,7 +144,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .channel(Reference("#/channels/subscribe")) .reply(OperationReply( null, - Reference("#/channels/currencyInfo"), + Reference("#/channels/currencyInfo"), null )) .build() @@ -154,7 +154,7 @@ class KrakenWebsocketRequestReplyMultipleChannelsAsyncAPI: AbstractExampleValida .channel(Reference("#/channels/unsubscribe")) .reply(OperationReply( null, - Reference("#/channels/currencyInfo"), + Reference("#/channels/currencyInfo"), listOf(Reference("#/channels/currencyInfo/messages/subscriptionStatus")) )) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt index 363e8151..009307f4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/MercureAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -10,7 +10,7 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class MercureAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt index 5faf9053..821fcce1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/NotAsyncAPI.kt @@ -1,13 +1,13 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class NotAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt index 797d4331..f755839e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OneOfAsyncAPI.kt @@ -1,13 +1,13 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class OneOfAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt index 9271b7bc..ca91c123 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/OperationSecurityAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationBinding import com.asyncapi.bindings.http.v0._3_0.operation.HTTPOperationMethod import com.asyncapi.v3._0_0.model.channel.Channel @@ -9,10 +9,10 @@ import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v3.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ClientCredentialsOAuthFlow class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { @@ -35,7 +35,7 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { .address("AUTHORIZATION_REVOCATION") .messages(mapOf( Pair("message", - Reference("#/components/messages/message") + Reference("#/components/messages/message") ) )) .build() @@ -76,7 +76,7 @@ class OperationSecurityAsyncAPI: AbstractExampleValidationTest() { .build()) )) .messages(listOf( - Reference("#/channels/authRevoke/messages/message") + Reference("#/channels/authRevoke/messages/message") )) .build() ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt index 707e1b6a..c1effc03 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcClientAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId @@ -14,7 +14,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class RpcClientAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt index f3c7cfa7..0448517f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/RpcServerAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.CorrelationId @@ -14,7 +14,7 @@ import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelBinding import com.asyncapi.bindings.amqp.v0._3_0.channel.AMQPChannelType import com.asyncapi.bindings.amqp.v0._3_0.channel.queue.AMQPChannelQueueProperties import com.asyncapi.bindings.amqp.v0._3_0.operation.AMQPOperationBinding -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class RpcServerAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt index d55b0d5d..156fbfa6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SimpleAsyncAPI.kt @@ -1,13 +1,13 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class SimpleAsyncAPI: AbstractExampleValidationTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt index 755ae1cf..6458ba2b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/SlackRtmAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.message.Message import com.asyncapi.v3._0_0.model.component.Components @@ -8,8 +8,8 @@ import com.asyncapi.v3._0_0.model.info.Info import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v3.http.HttpApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v3.http.HttpApiKeySecurityScheme class SlackRtmAsyncAPI: AbstractExampleValidationTest() { @@ -264,11 +264,12 @@ class SlackRtmAsyncAPI: AbstractExampleValidationTest() { override fun expectedComponents(): Components? { return Components.builder() .securitySchemes(mapOf( - Pair("token", HttpApiKeySecurityScheme( - null, - "token", - HttpApiKeySecurityScheme.ApiKeyLocation.QUERY - ) + Pair("token", + HttpApiKeySecurityScheme( + null, + "token", + HttpApiKeySecurityScheme.ApiKeyLocation.QUERY + ) ) )) .schemas(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt index 1acbaeb1..e98e7bac 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -14,8 +14,8 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v3.SecurityScheme +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import java.math.BigDecimal class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { @@ -69,7 +69,7 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { .protocol("kafka-secure") .description("Test broker secured with X509") .security(listOf( - Reference("#/components/securitySchemes/certs") + Reference("#/components/securitySchemes/certs") )) .tags(listOf( Tag.builder() @@ -96,11 +96,11 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting.streetlights.1.0.event.{streetlightId}.lighting.measured") .messages(mapOf(Pair("lightMeasured", - Reference("#/components/messages/lightMeasured") + Reference("#/components/messages/lightMeasured") ))) .description("The topic on which measured values may be produced and consumed.") .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .build() ), @@ -108,10 +108,10 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting.streetlights.1.0.action.{streetlightId}.turn.on") .messages(mapOf(Pair("turnOn", - Reference("#/components/messages/turnOnOff") + Reference("#/components/messages/turnOnOff") ))) .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .build() ), @@ -119,10 +119,10 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting.streetlights.1.0.action.{streetlightId}.turn.off") .messages(mapOf(Pair("turnOff", - Reference("#/components/messages/turnOnOff") + Reference("#/components/messages/turnOnOff") ))) .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .build() ), @@ -130,10 +130,10 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { Channel.builder() .address("smartylighting.streetlights.1.0.action.{streetlightId}.dim") .messages(mapOf(Pair("dimLight", - Reference("#/components/messages/dimLight") + Reference("#/components/messages/dimLight") ))) .parameters(mapOf(Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ))) .build() ) @@ -279,10 +279,10 @@ class StreetlightsKafkaAsyncAPI: AbstractExampleValidationTest() { .build() ), Pair("certs", - SecurityScheme( - SecurityScheme.Type.X509, - "Download the certificate files from service provider" - ) + SecurityScheme( + SecurityScheme.Type.X509, + "Download the certificate files from service provider" + ) ) )) .parameters(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index aaffec73..3d31fb9e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -1,8 +1,8 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.security.v3.ApiKeySecurityScheme -import com.asyncapi.schemas.security.v3.OpenIdConnectSecurityScheme -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.security.v3.ApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.Tag import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -17,13 +17,13 @@ import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v3.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow -import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow -import com.asyncapi.schemas.security.v3.oauth2.flow.ImplicitOAuthFlow -import com.asyncapi.schemas.security.v3.oauth2.flow.PasswordOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ImplicitOAuthFlow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.PasswordOAuthFlow import java.math.BigDecimal class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { @@ -66,7 +66,7 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { ) )) .security(listOf( - Reference("#/components/securitySchemes/apiKey"), + Reference("#/components/securitySchemes/apiKey"), OAuth2SecurityScheme( "Flows to support OAuth 2.0", OAuthFlows( @@ -146,7 +146,7 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { ), listOf("streetlights:on", "streetlights:off", "streetlights:dim") ), - Reference("#/components/securitySchemes/openIdConnectWellKnown") + Reference("#/components/securitySchemes/openIdConnectWellKnown") )) .tags(listOf( Tag("env:production", "This environment is meant for production use case", null), @@ -165,13 +165,13 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { .address("smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured") .messages(mapOf( Pair("lightMeasured", - Reference("#/components/messages/lightMeasured") + Reference("#/components/messages/lightMeasured") ) )) .description("The topic on which measured values may be produced and consumed.") .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .build() @@ -181,12 +181,12 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { .address("smartylighting/streetlights/1/0/action/{streetlightId}/turn/on") .messages(mapOf( Pair("turnOn", - Reference("#/components/messages/turnOnOff") + Reference("#/components/messages/turnOnOff") ) )) .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .build() @@ -196,12 +196,12 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { .address("smartylighting/streetlights/1/0/action/{streetlightId}/turn/off") .messages(mapOf( Pair("turnOff", - Reference("#/components/messages/turnOnOff") + Reference("#/components/messages/turnOnOff") ) )) .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .build() @@ -211,12 +211,12 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { .address("smartylighting/streetlights/1/0/action/{streetlightId}/dim") .messages(mapOf( Pair("dimLight", - Reference("#/components/messages/dimLight") + Reference("#/components/messages/dimLight") ) )) .parameters(mapOf( Pair("streetlightId", - Reference("#/components/parameters/streetlightId") + Reference("#/components/parameters/streetlightId") ) )) .build() @@ -352,10 +352,10 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { )) .securitySchemes(mapOf( Pair("apiKey", - ApiKeySecurityScheme( - "Provide your API key as the user and leave the password empty.", - ApiKeySecurityScheme.ApiKeyLocation.USER - ) + ApiKeySecurityScheme( + "Provide your API key as the user and leave the password empty.", + ApiKeySecurityScheme.ApiKeyLocation.USER + ) ), Pair("supportedOauthFlows", OAuth2SecurityScheme( @@ -415,11 +415,11 @@ class StreetlightsMQTTAsyncAPI: AbstractExampleValidationTest() { ) ), Pair("openIdConnectWellKnown", - OpenIdConnectSecurityScheme( - null, - "https://authserver.example/.well-known", - null - ) + OpenIdConnectSecurityScheme( + null, + "https://authserver.example/.well-known", + null + ) ) )) .parameters(mapOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt index fe93b9cf..5be15fa3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter import com.asyncapi.v3._0_0.model.channel.message.Message @@ -13,11 +13,11 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.security.v3.SecurityScheme -import com.asyncapi.schemas.security.v3.oauth2.OAuth2SecurityScheme -import com.asyncapi.schemas.security.v3.oauth2.OAuthFlows -import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlow +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuth2SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuthFlows +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ClientCredentialsOAuthFlow import java.math.BigDecimal class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { @@ -135,23 +135,24 @@ class StreetlightsOperationSecurityAsyncAPI: AbstractExampleValidationTest() { } override fun expectedOperations(): Map { - val oAuth2SecurityScheme = OAuth2SecurityScheme( - "The oauth security descriptions", - OAuthFlows( - null, - null, - ClientCredentialsOAuthFlow( - "", - mapOf( - Pair("streetlights:read", "Scope required for subscribing to channel"), - Pair("streetlights:write", "Scope required for publishing to channel") + val oAuth2SecurityScheme = + OAuth2SecurityScheme( + "The oauth security descriptions", + OAuthFlows( + null, + null, + ClientCredentialsOAuthFlow( + "", + mapOf( + Pair("streetlights:read", "Scope required for subscribing to channel"), + Pair("streetlights:write", "Scope required for publishing to channel") + ), + "https://example.com/api/oauth/dialog" ), - "https://example.com/api/oauth/dialog" + null ), - null - ), - listOf("streetlights:read") - ) + listOf("streetlights:read") + ) return mapOf( Pair("receiveLightMeasurement", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt index 6ca411dc..2de233bd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/WebsocketGeminiAsyncAPI.kt @@ -1,6 +1,6 @@ package com.asyncapi.examples.v3._0_0 -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.channel.Channel import com.asyncapi.v3._0_0.model.channel.Parameter @@ -13,7 +13,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class WebsocketGeminiAsyncAPI: AbstractExampleValidationTest() { @@ -52,7 +52,7 @@ class WebsocketGeminiAsyncAPI: AbstractExampleValidationTest() { .messages( mapOf( Pair("marketData", - Reference("#/components/messages/marketData") + Reference("#/components/messages/marketData") ) ) ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt index f765a0b0..88ebe927 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonPropertiesTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.json.properties.* import com.asyncapi.v3.ClasspathUtils diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt index 2839f1a5..6673df64 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/ReadJsonSchemaTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.* import com.asyncapi.v3.ClasspathUtils import com.fasterxml.jackson.annotation.JsonInclude diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt index 455ed38f..e0ec1462 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/SchemaProvider.kt @@ -1,8 +1,9 @@ package com.asyncapi.schemas +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema -import com.asyncapi.schemas.multiformat.JsonFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.JsonFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema interface SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt index ad341504..42158c79 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ArraysSchemaTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.SchemaProvider class ArraysSchemaTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt index 30e7f459..2231ba88 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ComplexObjectTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt index 7673b3eb..6459174b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/ConditionalValidationIfElse.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.SchemaProvider class ConditionalValidationIfElse: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt index 9214340a..c38bb631 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/Draft07CoreSchemaMetaSchemaTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt index 8e9019c5..dd03670f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/EnumeratedValuesTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.SchemaProvider class EnumeratedValuesTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt index a91fd462..1568e08b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/PersonTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt index e038d39e..2225c88e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/RegexPatternTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.SchemaProvider class RegexPatternTest: SchemaProvider { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt index dfc00839..3753a172 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesArrayTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt index f84b40fd..521c6e34 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMaximumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt index 74fc38f3..03f30ae6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalMinimumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt index 8668f7e1..765ee71d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigDecimalTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt index a908c021..300ec870 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMaximumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt index 96c8c928..c1743534 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerMinimumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt index d5afc5a8..fe2321f5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBigIntegerTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider import java.math.BigInteger diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt index 0130ac09..48e7dec3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanFalseTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt index 891f13e8..16f4b189 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesBooleanTrueTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt index ce076e79..9b96159c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMaximumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt index ee0aaf00..595075ab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleMinimumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt index 6cfd91e6..7b79e7ef 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesDoubleTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt index 53312526..c8946a31 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMaximumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt index c73ab66d..09f99541 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntMinimumTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt index a41c24dc..5d0c3299 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesIntTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt index 52d4f13d..a14b9e25 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesNullTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt index 83ea1810..8c2239d6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/json/properties/ConstDefaultExamplesObjectTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.json.properties -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.SchemaProvider diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt index a9522f64..391d69d2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt index dc38ed3f..59a06190 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_0_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt index 9bc3954d..c5ffdd7e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_1_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt index b015757a..26b9421a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_2_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt index 7fb3e307..af863462 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_3_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt index f0548d6e..7c6b0f7f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_4_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt index 792fe8bb..5ff9eaa2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_5_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt index 905fdab6..b41917a8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV2_6_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt index 6e1d8c94..73ce170f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/AsyncAPIFormatSchemaV3_0_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt index fe772fcc..a8820002 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/EmptySchemaFormatTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt index 13cf32fd..8a431ad4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/NullSchemaFormatTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt index eb91db9c..7658e720 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/asyncapi/WithoutSchemaFormatTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.asyncapi import com.asyncapi.schemas.json.* -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroFormatSchemaTest.kt index d1c56ada..b065b3de 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroFormatSchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.avro import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.schemas.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt index c6b26eb5..8c5a3f02 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider -import com.asyncapi.schemas.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt index df0b8eae..235a9c1f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_1Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider -import com.asyncapi.schemas.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt index 3f242770..04c63323 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_10_2Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider -import com.asyncapi.schemas.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt index 0c1b56c7..b6d94b7d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider -import com.asyncapi.schemas.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt index add37c66..b01ffa25 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_11_1Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider -import com.asyncapi.schemas.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt index 11bac268..bc130304 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_0Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider -import com.asyncapi.schemas.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt index 6d4fbf14..94589241 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_1Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider -import com.asyncapi.schemas.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt index fcc76ace..73b0e666 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/avro/AvroSchemaFormatSchemaV1_9_2Test.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.avro import com.asyncapi.schemas.avro.AvroSchemasProvider -import com.asyncapi.schemas.multiformat.AvroFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt index 110ac27d..49f4b56a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/json/JsonFormatSchemaTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.schemas.multiformat.json import com.asyncapi.schemas.json.* import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.schemas.multiformat.JsonFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.JsonFormatSchema import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory @@ -63,11 +63,15 @@ abstract class JsonFormatSchemaTest { ), Arguments.of( "/schemas/multiformat/json/schema+json/conditional-validation-if-else.schema.json", - JsonFormatSchema(ConditionalValidationIfElse().jsonSchema()) + JsonFormatSchema( + ConditionalValidationIfElse().jsonSchema() + ) ), Arguments.of( "/schemas/multiformat/json/schema+json/draft-07-core-schema-meta-schema.json", - JsonFormatSchema(Draft07CoreSchemaMetaSchemaTest().jsonSchema()) + JsonFormatSchema( + Draft07CoreSchemaMetaSchemaTest().jsonSchema() + ) ), Arguments.of( "/schemas/multiformat/json/schema+json/enumerated-values.schema.json", diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaTest.kt index c4339575..3f05181e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.schemas.multiformat.openapi import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.OpenAPIFormatSchema import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt index ea4d7c2a..4a42ac1a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.multiformat.openapi -import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.OpenAPIFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt index afadcfc8..391f10a7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.multiformat.openapi -import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.OpenAPIFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt index 47f569bf..1474951d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.multiformat.openapi -import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.OpenAPIFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt index 031371d3..e4530421 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt @@ -1,6 +1,6 @@ package com.asyncapi.schemas.multiformat.openapi -import com.asyncapi.schemas.multiformat.OpenAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.OpenAPIFormatSchema import com.asyncapi.schemas.openapi.v3._0_0.SchemaTest import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ApiKeySecuritySchemeTest.kt index d2717e34..47d3679c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ApiKeySecuritySchemeTest.kt @@ -1,5 +1,7 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.ApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/AsymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/AsymmetricEncryptionSecuritySchemeTest.kt index f5c83fbc..491118e8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/AsymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/AsymmetricEncryptionSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/GssapiSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/GssapiSecuritySchemeTest.kt index 928fd282..787e4b3a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/GssapiSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/GssapiSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/OpenIdConnectSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/OpenIdConnectSecuritySchemeTest.kt index 7a9009d2..60ff0bd1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/OpenIdConnectSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/OpenIdConnectSecuritySchemeTest.kt @@ -1,5 +1,7 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/PlainSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/PlainSecuritySchemeTest.kt index 2ccca2af..cc9d72c8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/PlainSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/PlainSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha256SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha256SecuritySchemeTest.kt index 2ac269c2..780854db 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha256SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha256SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha512SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha512SecuritySchemeTest.kt index 4e11d3af..ec4127a8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha512SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/ScramSha512SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/SymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/SymmetricEncryptionSecuritySchemeTest.kt index c5ec6954..3dad068f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/SymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/SymmetricEncryptionSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/UserPasswordSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/UserPasswordSecuritySchemeTest.kt index 5e07c224..e0262a45 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/UserPasswordSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/UserPasswordSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/X509SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/X509SecuritySchemeTest.kt index 5ad78cdb..66c82216 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/X509SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/X509SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2 +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.v2.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpApiKeySecuritySchemeTest.kt index d39b2a82..3ed1cf3c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpApiKeySecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2.http +import com.asyncapi.schemas.asyncapi.security.v2.http.HttpApiKeySecurityScheme import com.asyncapi.v2.SerDeTest class HttpApiKeySecuritySchemeTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpSecuritySchemeTest.kt index 75c2f7fd..e308cb1c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/http/HttpSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2.http +import com.asyncapi.schemas.asyncapi.security.v2.http.HttpSecurityScheme import com.asyncapi.v2.SerDeTest class HttpSecuritySchemeBasicTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecuritySchemeTest.kt index 240849ea..d87432ce 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuth2SecuritySchemeTest.kt @@ -1,7 +1,8 @@ package com.asyncapi.schemas.security.v2.oauth2 import com.asyncapi.v2.SerDeTest -import com.asyncapi.schemas.security.v2.SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme /** * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuthFlowTest.kt index 2070c33b..2330c18c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/OAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2.oauth2 +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuthFlows import com.asyncapi.v2.SerDeTest import com.asyncapi.schemas.security.v2.oauth2.flow.* diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt index 7bfcda03..7c3ab64a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow import com.asyncapi.v2.SerDeTest class AuthorizationCodeOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlowTest.kt index f9201848..6647378f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ClientCredentialsOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow import com.asyncapi.v2.SerDeTest class ClientCredentialsOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlowTest.kt index 8871d720..147a5a60 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/ImplicitOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ImplicitOAuthFlow import com.asyncapi.v2.SerDeTest class ImplicitOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlowTest.kt index 1d16ee7c..3dc21928 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/OAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.OAuthFlow import com.asyncapi.v2.SerDeTest class OAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlowTest.kt index bb96e564..e5ee7d1d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v2/oauth2/flow/PasswordOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v2.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.PasswordOAuthFlow import com.asyncapi.v2.SerDeTest class PasswordOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ApiKeySecuritySchemeTest.kt index 0c3fae6a..80cc85c2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ApiKeySecuritySchemeTest.kt @@ -1,5 +1,7 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.ApiKeySecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/AsymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/AsymmetricEncryptionSecuritySchemeTest.kt index 65538564..955c680f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/AsymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/AsymmetricEncryptionSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/GssapiSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/GssapiSecuritySchemeTest.kt index d7df0d9e..5b33ed0f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/GssapiSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/GssapiSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/OpenIdConnectSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/OpenIdConnectSecuritySchemeTest.kt index fccdaf9e..5027bc11 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/OpenIdConnectSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/OpenIdConnectSecuritySchemeTest.kt @@ -1,5 +1,7 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.OpenIdConnectSecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/PlainSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/PlainSecuritySchemeTest.kt index a0b121a0..57abde29 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/PlainSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/PlainSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha256SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha256SecuritySchemeTest.kt index 393c2f4e..9206f98c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha256SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha256SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha512SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha512SecuritySchemeTest.kt index 8af7a75d..e4218582 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha512SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/ScramSha512SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/SymmetricEncryptionSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/SymmetricEncryptionSecuritySchemeTest.kt index 9f0f56e1..ae3b2096 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/SymmetricEncryptionSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/SymmetricEncryptionSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/UserPasswordSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/UserPasswordSecuritySchemeTest.kt index 8be9e3b1..5f540ed5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/UserPasswordSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/UserPasswordSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/X509SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/X509SecuritySchemeTest.kt index 88734de3..4879d6ae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/X509SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/X509SecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3 +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpApiKeySecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpApiKeySecuritySchemeTest.kt index 14a3fa55..4ecc6cd7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpApiKeySecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpApiKeySecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3.http +import com.asyncapi.schemas.asyncapi.security.v3.http.HttpApiKeySecurityScheme import com.asyncapi.v3.SerDeTest class HttpApiKeySecuritySchemeTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpSecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpSecuritySchemeTest.kt index 7c355fe4..6970fc51 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpSecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/http/HttpSecuritySchemeTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3.http +import com.asyncapi.schemas.asyncapi.security.v3.http.HttpSecurityScheme import com.asyncapi.v3.SerDeTest class HttpSecuritySchemeBasicTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecuritySchemeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecuritySchemeTest.kt index 9d924a6f..33eb6c92 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecuritySchemeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuth2SecuritySchemeTest.kt @@ -1,7 +1,8 @@ package com.asyncapi.schemas.security.v3.oauth2 import com.asyncapi.v3.SerDeTest -import com.asyncapi.schemas.security.v3.SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuth2SecurityScheme /** * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuthFlowTest.kt index 565a074a..abf8c5a6 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/OAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3.oauth2 +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuthFlows import com.asyncapi.schemas.security.v3.oauth2.flow.AuthorizationCodeOAuthFlowTest import com.asyncapi.schemas.security.v3.oauth2.flow.ClientCredentialsOAuthFlowTest import com.asyncapi.schemas.security.v3.oauth2.flow.ImplicitOAuthFlowTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt index 89e8dbaf..2decfc3a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/AuthorizationCodeOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.AuthorizationCodeOAuthFlow import com.asyncapi.v3.SerDeTest class AuthorizationCodeOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlowTest.kt index 3081ba7e..a7fc838e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ClientCredentialsOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ClientCredentialsOAuthFlow import com.asyncapi.v3.SerDeTest class ClientCredentialsOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlowTest.kt index 7c5bbb62..1df906d2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/ImplicitOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ImplicitOAuthFlow import com.asyncapi.v3.SerDeTest class ImplicitOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlowTest.kt index 5784c69e..92549356 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/OAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.OAuthFlow import com.asyncapi.v3.SerDeTest class OAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlowTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlowTest.kt index f60df823..8a7c1816 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlowTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/schemas/security/v3/oauth2/flow/PasswordOAuthFlowTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.schemas.security.v3.oauth2.flow +import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.PasswordOAuthFlow import com.asyncapi.v3.SerDeTest class PasswordOAuthFlowTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt index fbf91baf..bfaf0524 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/SerDeTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2 -import com.asyncapi.schemas.ExtendableObject +import com.asyncapi.schemas.asyncapi.ExtendableObject import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.JsonMappingException import com.fasterxml.jackson.databind.ObjectMapper diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt index 3a4c9f8a..9e49c42d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/ReferenceTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 074777d3..87e5f7f4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v2._0_0.model.channel import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._0_0.model.channel.operation.OperationWithReferenceToMessageTest -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.bindings.ChannelBinding import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ParameterTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ParameterTest.kt index 4880c61e..6b6a16b9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ParameterTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ParameterTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model.channel import com.asyncapi.v2.SerDeTest -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema /** * @author Pavel Bodiachevskii diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 50e2cb94..5bd5925e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -2,9 +2,9 @@ package com.asyncapi.v2._0_0.model.channel.message import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.bindings.MessageBinding import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding @@ -41,7 +41,8 @@ class MessageTest: SerDeTest() { override fun build(): Message { return Message.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( @@ -61,7 +62,8 @@ class MessageTest: SerDeTest() { )) .build() ) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 1ffae1ae..00fd88e5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -3,7 +3,7 @@ package com.asyncapi.v2._0_0.model.channel.message import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation import com.asyncapi.v2._0_0.model.Tag -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test @@ -39,7 +39,8 @@ class MessageTraitTest: SerDeTest() { override fun build(): MessageTrait { return MessageTrait.builder() - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index d4d88513..c2fc29e3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v2._0_0.model.channel.operation import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._0_0.model.ExternalDocumentation -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.Tag import com.asyncapi.v2._0_0.model.channel.message.MessageTest import com.asyncapi.bindings.OperationBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt index 118791d9..3b3987e8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/component/ComponentsTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.model.component import com.asyncapi.v2.SerDeTest -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2._0_0.model.channel.ChannelItemTest import com.asyncapi.v2._0_0.model.channel.ParameterTest import com.asyncapi.v2._0_0.model.channel.message.CorrelationIdTest @@ -9,7 +9,7 @@ import com.asyncapi.v2._0_0.model.channel.message.MessageTest import com.asyncapi.v2._0_0.model.channel.message.MessageTraitTest import com.asyncapi.v2._0_0.model.channel.operation.OperationTest import com.asyncapi.v2._0_0.model.channel.operation.OperationTraitTest -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.Type import com.asyncapi.v2._0_0.model.server.ServerTest import com.asyncapi.schemas.security.v2.ApiKeySecuritySchemeTest @@ -51,7 +51,9 @@ class ComponentsTest: SerDeTest() { )) .build() ), - Pair("User", Reference("#/components/schemas/user")) + Pair("User", + Reference("#/components/schemas/user") + ) )) .messages(mapOf( Pair("userSignup", MessageTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt index 32179815..dcab9dda 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/AsyncAPITest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.channel.ChannelItemTest import com.asyncapi.v2._6_0.model.component.ComponentsTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt index 6c9044b4..3ab6c686 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/ReferenceTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 28735883..5726c7c7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -1,10 +1,10 @@ package com.asyncapi.v2._6_0.model.channel -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithMessageTest import com.asyncapi.v2._6_0.model.channel.operation.OperationWithOneOfMessageTest -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test @@ -50,27 +50,39 @@ class ChannelItemTest: SerDeTest() { ), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), - Pair("http", Reference("#/components/channelBindings/http")), + Pair("http", + Reference("#/components/channelBindings/http") + ), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), - Pair("jms", Reference("#/components/channelBindings/jms")), + Pair("jms", + Reference("#/components/channelBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.channelBinding()), Pair("mercure", Reference("#/components/channelBindings/mercure") ), - Pair("mqtt", Reference("#/components/channelBindings/mqtt")), + Pair("mqtt", + Reference("#/components/channelBindings/mqtt") + ), Pair("mqtt5", Reference("#/components/channelBindings/mqtt5") ), - Pair("nats", Reference("#/components/channelBindings/nats")), + Pair("nats", + Reference("#/components/channelBindings/nats") + ), Pair("pulsar", PulsarV0_1_0Test.channelBinding()), Pair("redis", Reference("#/components/channelBindings/redis") ), - Pair("sns", Reference("#/components/channelBindings/sns")), + Pair("sns", + Reference("#/components/channelBindings/sns") + ), Pair("solace", Reference("#/components/channelBindings/solace") ), - Pair("sqs", Reference("#/components/channelBindings/sqs")), + Pair("sqs", + Reference("#/components/channelBindings/sqs") + ), Pair("stomp", Reference("#/components/channelBindings/stomp") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt index 5c0dc90b..fa227c18 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ParameterTest.kt @@ -1,8 +1,8 @@ package com.asyncapi.v2._6_0.model.channel -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2.SerDeTest -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema class ParameterWithReferenceToSchemaTest: SerDeTest() { diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index c5913457..63ef185a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -1,10 +1,10 @@ package com.asyncapi.v2._6_0.model.channel.message -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test @@ -26,7 +26,8 @@ class MessageTest: SerDeTest() { override fun build(): Message { return Message.builder() .messageId("userSignup") - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( @@ -46,7 +47,8 @@ class MessageTest: SerDeTest() { )) .build() ) - .payload(AsyncAPISchema.builder() + .payload( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( @@ -96,7 +98,9 @@ class MessageTest: SerDeTest() { Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), - Pair("jms", Reference("#/components/messageBindings/jms")), + Pair("jms", + Reference("#/components/messageBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") @@ -105,22 +109,30 @@ class MessageTest: SerDeTest() { Pair("mqtt5", Reference("#/components/messageBindings/mqtt5") ), - Pair("nats", Reference("#/components/messageBindings/nats")), + Pair("nats", + Reference("#/components/messageBindings/nats") + ), Pair("pulsar", Reference("#/components/messageBindings/pulsar") ), Pair("redis", Reference("#/components/messageBindings/redis") ), - Pair("sns", Reference("#/components/messageBindings/sns")), + Pair("sns", + Reference("#/components/messageBindings/sns") + ), Pair("solace", Reference("#/components/messageBindings/solace") ), - Pair("sqs", Reference("#/components/messageBindings/sqs")), + Pair("sqs", + Reference("#/components/messageBindings/sqs") + ), Pair("stomp", Reference("#/components/messageBindings/stomp") ), - Pair("ws", Reference("#/components/messageBindings/ws")) + Pair("ws", + Reference("#/components/messageBindings/ws") + ) ) } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 0d62317a..5612f801 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -1,10 +1,10 @@ package com.asyncapi.v2._6_0.model.channel.message -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test @@ -26,7 +26,8 @@ class MessageTraitTest: SerDeTest() { override fun build(): MessageTrait { return MessageTrait.builder() .messageId("userSignup") - .headers(AsyncAPISchema.builder() + .headers( + AsyncAPISchema.builder() .type("object") .properties(mapOf( Pair( @@ -100,7 +101,9 @@ class MessageTraitTest: SerDeTest() { Pair("stomp", Reference("#/components/messageBindings/stomp") ), - Pair("ws", Reference("#/components/messageBindings/ws")) + Pair("ws", + Reference("#/components/messageBindings/ws") + ) )) .examples(listOf(MessageExampleTest().build())) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageWithArrayPayloadTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageWithArrayPayloadTest.kt index 03653bd0..b7fc1a35 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageWithArrayPayloadTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageWithArrayPayloadTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.message import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt index c84fc858..82edef60 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessagesTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.model.channel.message import com.asyncapi.v2.ClasspathUtils -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 6f6c67c0..6ca6a9a7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.operation -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag @@ -150,7 +150,9 @@ class OperationTest { Pair("ibmmq", Reference("#/components/operationBindings/ibmmq") ), - Pair("jms", Reference("#/components/operationBindings/jms")), + Pair("jms", + Reference("#/components/operationBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") @@ -166,13 +168,19 @@ class OperationTest { Pair("redis", Reference("#/components/operationBindings/redis") ), - Pair("sns", Reference("#/components/operationBindings/sns")), + Pair("sns", + Reference("#/components/operationBindings/sns") + ), Pair("solace", SolaceV0_3_0Test.operationBinding()), - Pair("sqs", Reference("#/components/operationBindings/sqs")), + Pair("sqs", + Reference("#/components/operationBindings/sqs") + ), Pair("stomp", Reference("#/components/operationBindings/stomp") ), - Pair("ws", Reference("#/components/operationBindings/ws")) + Pair("ws", + Reference("#/components/operationBindings/ws") + ) ) } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 62161d3d..8860b248 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.channel.operation -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt index 0e0436d9..6311be76 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/component/ComponentsTest.kt @@ -1,8 +1,8 @@ package com.asyncapi.v2._6_0.model.component -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2.SerDeTest -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.Type import com.asyncapi.v2._6_0.model.channel.ChannelItemTest import com.asyncapi.v2._6_0.model.channel.ParameterWithSchemaTest @@ -54,7 +54,9 @@ class ComponentsTest: SerDeTest() { )) .build() ), - Pair("User", Reference("#/components/schemas/user")) + Pair("User", + Reference("#/components/schemas/user") + ) )) .servers(mapOf( Pair("mqtt-test", ServerTest().build()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index bf4a838c..8a6c5150 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v2._6_0.model.server -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v2.SerDeTest import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding; @@ -70,7 +70,9 @@ class ServerTest: SerDeTest() { @JvmStatic fun bindings(): Map { return mapOf( - Pair("amqp", Reference("#/components/serverBindings/amqp")), + Pair("amqp", + Reference("#/components/serverBindings/amqp") + ), Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt index feba59c1..6e39fe74 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/SerDeTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3 -import com.asyncapi.schemas.ExtendableObject +import com.asyncapi.schemas.asyncapi.ExtendableObject import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.JsonMappingException import com.fasterxml.jackson.databind.ObjectMapper diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt index b243668a..dc222869 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/AsyncAPITest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.channel.ChannelTest import com.asyncapi.v3._0_0.model.channel.ChannelTestWithReference diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt index fe3d6a5a..2066ec15 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/ReferenceTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DisplayName diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt index f6d1efe6..fbd72134 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/TagTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 3aa41a94..7f1a715f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.TagTest @@ -70,27 +70,39 @@ class ChannelTest: SerDeTest() { ), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), - Pair("http", Reference("#/components/channelBindings/http")), + Pair("http", + Reference("#/components/channelBindings/http") + ), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), - Pair("jms", Reference("#/components/channelBindings/jms")), + Pair("jms", + Reference("#/components/channelBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.channelBinding()), Pair("mercure", Reference("#/components/channelBindings/mercure") ), - Pair("mqtt", Reference("#/components/channelBindings/mqtt")), + Pair("mqtt", + Reference("#/components/channelBindings/mqtt") + ), Pair("mqtt5", Reference("#/components/channelBindings/mqtt5") ), - Pair("nats", Reference("#/components/channelBindings/nats")), + Pair("nats", + Reference("#/components/channelBindings/nats") + ), Pair("pulsar", PulsarV0_1_0Test.channelBinding()), Pair("redis", Reference("#/components/channelBindings/redis") ), - Pair("sns", Reference("#/components/channelBindings/sns")), + Pair("sns", + Reference("#/components/channelBindings/sns") + ), Pair("solace", Reference("#/components/channelBindings/solace") ), - Pair("sqs", Reference("#/components/channelBindings/sqs")), + Pair("sqs", + Reference("#/components/channelBindings/sqs") + ), Pair("stomp", Reference("#/components/channelBindings/stomp") ), @@ -155,27 +167,39 @@ class ChannelTestWithReference: SerDeTest() { ), Pair("anypointmq", AnypointMQV0_0_1Test.channelBinding()), Pair("googlepubsub", GooglePubSubV0_1_0Test.channelBinding()), - Pair("http", Reference("#/components/channelBindings/http")), + Pair("http", + Reference("#/components/channelBindings/http") + ), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), - Pair("jms", Reference("#/components/channelBindings/jms")), + Pair("jms", + Reference("#/components/channelBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.channelBinding()), Pair("mercure", Reference("#/components/channelBindings/mercure") ), - Pair("mqtt", Reference("#/components/channelBindings/mqtt")), + Pair("mqtt", + Reference("#/components/channelBindings/mqtt") + ), Pair("mqtt5", Reference("#/components/channelBindings/mqtt5") ), - Pair("nats", Reference("#/components/channelBindings/nats")), + Pair("nats", + Reference("#/components/channelBindings/nats") + ), Pair("pulsar", PulsarV0_1_0Test.channelBinding()), Pair("redis", Reference("#/components/channelBindings/redis") ), - Pair("sns", Reference("#/components/channelBindings/sns")), + Pair("sns", + Reference("#/components/channelBindings/sns") + ), Pair("solace", Reference("#/components/channelBindings/solace") ), - Pair("sqs", Reference("#/components/channelBindings/sqs")), + Pair("sqs", + Reference("#/components/channelBindings/sqs") + ), Pair("stomp", Reference("#/components/channelBindings/stomp") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index 628b8038..beba4bae 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.channel.message -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag @@ -11,8 +11,8 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test -import com.asyncapi.schemas.AsyncAPISchema -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema class MessageTestWithSchema: SerDeTest() { @@ -94,7 +94,9 @@ class MessageTestWithSchema: SerDeTest() { Pair("googlepubsub", GooglePubSubV0_1_0Test.messageBinding()), Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), - Pair("jms", Reference("#/components/messageBindings/jms")), + Pair("jms", + Reference("#/components/messageBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") @@ -103,22 +105,30 @@ class MessageTestWithSchema: SerDeTest() { Pair("mqtt5", Reference("#/components/messageBindings/mqtt5") ), - Pair("nats", Reference("#/components/messageBindings/nats")), + Pair("nats", + Reference("#/components/messageBindings/nats") + ), Pair("pulsar", Reference("#/components/messageBindings/pulsar") ), Pair("redis", Reference("#/components/messageBindings/redis") ), - Pair("sns", Reference("#/components/messageBindings/sns")), + Pair("sns", + Reference("#/components/messageBindings/sns") + ), Pair("solace", Reference("#/components/messageBindings/solace") ), - Pair("sqs", Reference("#/components/messageBindings/sqs")), + Pair("sqs", + Reference("#/components/messageBindings/sqs") + ), Pair("stomp", Reference("#/components/messageBindings/stomp") ), - Pair("ws", Reference("#/components/messageBindings/ws")) + Pair("ws", + Reference("#/components/messageBindings/ws") + ) ) } } @@ -193,7 +203,9 @@ class MessageTestWithReference: SerDeTest() { Pair("stomp", Reference("#/components/messageBindings/stomp") ), - Pair("ws", Reference("#/components/messageBindings/ws")) + Pair("ws", + Reference("#/components/messageBindings/ws") + ) )) .examples(listOf(MessageExampleTest().build())) .traits(listOf( @@ -314,7 +326,9 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { Pair("stomp", Reference("#/components/messageBindings/stomp") ), - Pair("ws", Reference("#/components/messageBindings/ws")) + Pair("ws", + Reference("#/components/messageBindings/ws") + ) )) .examples(listOf(MessageExampleTest().build())) .traits(listOf( diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index cdc1c5a9..77a10e5b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -1,10 +1,10 @@ package com.asyncapi.v3._0_0.model.channel.message -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test @@ -12,7 +12,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test -import com.asyncapi.schemas.multiformat.AsyncAPIFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema class MessageTraitTestWithSchema: SerDeTest() { @@ -100,7 +100,9 @@ class MessageTraitTestWithSchema: SerDeTest() { Pair("stomp", Reference("#/components/messageBindings/stomp") ), - Pair("ws", Reference("#/components/messageBindings/ws")) + Pair("ws", + Reference("#/components/messageBindings/ws") + ) )) .examples(listOf(MessageExampleTest().build())) .build() @@ -175,7 +177,9 @@ class MessageTraitTestWithReference: SerDeTest() { Pair("stomp", Reference("#/components/messageBindings/stomp") ), - Pair("ws", Reference("#/components/messageBindings/ws")) + Pair("ws", + Reference("#/components/messageBindings/ws") + ) )) .examples(listOf(MessageExampleTest().build())) .build() @@ -273,7 +277,9 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { Pair("stomp", Reference("#/components/messageBindings/stomp") ), - Pair("ws", Reference("#/components/messageBindings/ws")) + Pair("ws", + Reference("#/components/messageBindings/ws") + ) )) .examples(listOf(MessageExampleTest().build())) .build() diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageWithArrayPayloadTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageWithArrayPayloadTest.kt index f4a67f95..80ce5ed8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageWithArrayPayloadTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageWithArrayPayloadTest.kt @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.model.channel.message import com.asyncapi.v3.ClasspathUtils -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.fasterxml.jackson.databind.ObjectMapper import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt index 4a611b37..ddf6b1f2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/component/ComponentsTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.component -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.TagTest @@ -18,10 +18,10 @@ import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyTest import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyTestWithReference import com.asyncapi.v3._0_0.model.server.ServerTest import com.asyncapi.v3._0_0.model.server.ServerVariableTest -import com.asyncapi.schemas.AsyncAPISchema +import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.json.JsonSchema import com.asyncapi.schemas.Type -import com.asyncapi.schemas.multiformat.JsonFormatSchema +import com.asyncapi.schemas.asyncapi.multiformat.JsonFormatSchema import com.asyncapi.schemas.security.v3.ApiKeySecuritySchemeTest import com.asyncapi.schemas.security.v3.OpenIdConnectSecuritySchemeTest import com.asyncapi.schemas.security.v3.http.HttpApiKeySecuritySchemeTest @@ -80,43 +80,47 @@ class ComponentsTest: SerDeTest() { .build() ) ), - Pair("User", Reference("#/components/schemas/user")) + Pair("User", + Reference("#/components/schemas/user") + ) )) .servers(mapOf( Pair("mqtt-test", ServerTest().build()), Pair("mqtt-stage", - Reference("#/components/servers/mqtt-stage") + Reference("#/components/servers/mqtt-stage") ) )) .serverVariables(mapOf( Pair("port", ServerVariableTest().build()), Pair("basePath", - Reference("#/components/serverVariables/basePath") + Reference("#/components/serverVariables/basePath") ) )) .channels(mapOf( Pair("channel 1", ChannelTest().build()), Pair("channel 2", ChannelTestWithReference().build()), Pair("channel 3", - Reference("#/components/channels/channel") + Reference("#/components/channels/channel") ), )) .operations(mapOf( Pair("operation 1", OperationTest().build()), Pair("operation 2", OperationTestWithReference().build()), Pair("operation 3", - Reference("#/components/operations/operation") + Reference("#/components/operations/operation") ) )) .replies(mapOf( Pair("reply 1", OperationReplyTest().build()), Pair("reply 2", OperationReplyTestWithReference().build()), - Pair("reply 3", Reference("#/components/replies/reply")) + Pair("reply 3", + Reference("#/components/replies/reply") + ) )) .replyAddresses(mapOf( Pair("reply addresses 1", OperationReplyAddressTest().build()), Pair("reply addresses 2", - Reference("#/components/replyAddresses/replyAddress") + Reference("#/components/replyAddresses/replyAddress") ) )) .messages(mapOf( @@ -124,16 +128,16 @@ class ComponentsTest: SerDeTest() { Pair("message 2", MessageTestWithMultiFormatSchema().build()), Pair("message 3", MessageTestWithReference().build()), Pair("message 4", - Reference("#/components/messages/message") + Reference("#/components/messages/message") ) )) .securitySchemes(mapOf( Pair("apiKey", ApiKeySecuritySchemeTest().build()), Pair("asymmetricEncryption", - Reference("#/components/securitySchemes/asymmetricEncryption") + Reference("#/components/securitySchemes/asymmetricEncryption") ), Pair("gssapi", - Reference("#/components/securitySchemes/gssapi") + Reference("#/components/securitySchemes/gssapi") ), Pair("oauth2", OAuth2SecuritySchemeTest().build()), Pair("openIdConnect", OpenIdConnectSecuritySchemeTest().build()), @@ -141,41 +145,41 @@ class ComponentsTest: SerDeTest() { Pair("httpBasic", HttpSecuritySchemeBasicTest().build()), Pair("httpBearer", HttpSecuritySchemeBearerTest().build()), Pair("plain", - Reference("#/components/securitySchemes/plain") + Reference("#/components/securitySchemes/plain") ), Pair("scramSha256", - Reference("#/components/securitySchemes/scramSha256") + Reference("#/components/securitySchemes/scramSha256") ), Pair("scramSha512", - Reference("#/components/securitySchemes/scramSha512") + Reference("#/components/securitySchemes/scramSha512") ), Pair("symmetricEncryption", - Reference("#/components/securitySchemes/symmetricEncryption") + Reference("#/components/securitySchemes/symmetricEncryption") ), Pair("userPassword", - Reference("#/components/securitySchemes/userPassword") + Reference("#/components/securitySchemes/userPassword") ), Pair("X509", - Reference("#/components/securitySchemes/X509") + Reference("#/components/securitySchemes/X509") ), )) .parameters(mapOf( Pair("parameter 1", ParameterTest().build()), Pair("parameter 2", - Reference("#/components/parameters/parameter") + Reference("#/components/parameters/parameter") ) )) .correlationIds(mapOf( Pair("correlationId 1", CorrelationIdTest().build()), Pair("correlationId 2", - Reference("#/correlationIds/parameters/correlationId") + Reference("#/correlationIds/parameters/correlationId") ) )) .operationTraits(mapOf( Pair("operationTrait 1", OperationTraitTest().build()), Pair("operationTrait 2", OperationTraitTestWithReference().build()), Pair("operationTrait 3", - Reference("#/components/operationTraits/operationTrait") + Reference("#/components/operationTraits/operationTrait") ) )) .messageTraits(mapOf( @@ -183,7 +187,7 @@ class ComponentsTest: SerDeTest() { Pair("messageTrait 2", MessageTraitTestWithMultiFormatSchema().build()), Pair("messageTrait 3", MessageTraitTestWithReference().build()), Pair("messageTrait 4", - Reference("#/components/messageTraits/messageTrait") + Reference("#/components/messageTraits/messageTrait") ) )) .serverBindings(ServerTest.bindings()) @@ -193,13 +197,15 @@ class ComponentsTest: SerDeTest() { .externalDocs(mapOf( Pair("externalDoc 1", ExternalDocumentationTest().build()), Pair("externalDoc 2", - Reference("#/components/externalDocs/externalDoc") + Reference("#/components/externalDocs/externalDoc") ), )) .tags(mapOf( Pair("tag 1", TagTest().build()), Pair("tag 2", TagTestWithReferenceToExternalDocs().build()), - Pair("tag 3", Reference("#/components/tags/tag")), + Pair("tag 3", + Reference("#/components/tags/tag") + ), )) .build() } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt index 976cb2a0..becf5045 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/info/InfoTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.info -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.TagTest diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 613bbbcf..dbd7842b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.SolaceV0_3_0Test -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag @@ -77,7 +77,9 @@ class OperationTest: SerDeTest() { Pair("ibmmq", Reference("#/components/operationBindings/ibmmq") ), - Pair("jms", Reference("#/components/operationBindings/jms")), + Pair("jms", + Reference("#/components/operationBindings/jms") + ), Pair("kafka", KafkaV0_4_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") @@ -93,13 +95,19 @@ class OperationTest: SerDeTest() { Pair("redis", Reference("#/components/operationBindings/redis") ), - Pair("sns", Reference("#/components/operationBindings/sns")), + Pair("sns", + Reference("#/components/operationBindings/sns") + ), Pair("solace", SolaceV0_3_0Test.operationBinding()), - Pair("sqs", Reference("#/components/operationBindings/sqs")), + Pair("sqs", + Reference("#/components/operationBindings/sqs") + ), Pair("stomp", Reference("#/components/operationBindings/stomp") ), - Pair("ws", Reference("#/components/operationBindings/ws")) + Pair("ws", + Reference("#/components/operationBindings/ws") + ) ) } } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index c9abdd87..2f9bd763 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.SolaceV0_3_0Test -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation import com.asyncapi.v3._0_0.model.Tag diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt index a57e08bf..a3ab8553 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/reply/OperationReplyTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.operation.reply -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest /** diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 0aa1d1da..80e9fbf5 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -1,6 +1,6 @@ package com.asyncapi.v3._0_0.model.server -import com.asyncapi.schemas.Reference +import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentationTest import com.asyncapi.v3._0_0.model.Tag @@ -78,7 +78,9 @@ class ServerTest: SerDeTest() { @JvmStatic fun bindings(): Map { return mapOf( - Pair("amqp", Reference("#/components/serverBindings/amqp")), + Pair("amqp", + Reference("#/components/serverBindings/amqp") + ), Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), @@ -195,7 +197,9 @@ class ServerTestWithReference: SerDeTest() { @JvmStatic fun bindings(): Map { return mapOf( - Pair("amqp", Reference("#/components/serverBindings/amqp")), + Pair("amqp", + Reference("#/components/serverBindings/amqp") + ), Pair("amqp1", AMQP1ServerBinding()), Pair("anypointmq", AnypointMQServerBinding()), Pair("googlepubsub", GooglePubSubV0_2_0Test.serverBinding()), From f4c7ab824dce2464d6decadbb8ac73cd3b8851dd Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Fri, 10 May 2024 02:07:57 +0400 Subject: [PATCH 097/141] docs: changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eabdd65d..836c4dff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.0-RC2] - TBA + +### Changed + +- All schemas now are located in `schemas` package +- All bindings now are located in `bindings` package +- Bindings structure was changed. Each binding now holds `channel`, `server`, `message`, `operation` inside package +- Bindings now are common for v2 and v3 versions + ## [1.0.0-RC] - 2024-04-20 ### Added From 90a08672e3b9b8534334d8c1aaa5424f4a8186a9 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sat, 11 May 2024 01:59:47 +0400 Subject: [PATCH 098/141] feat(bindings): SQS 0.2.0 --- .../bindings/sqs/SQSChannelBinding.java | 14 +- .../bindings/sqs/SQSMessageBinding.java | 14 +- .../bindings/sqs/SQSOperationBinding.java | 14 +- .../bindings/sqs/SQSServerBinding.java | 14 +- .../v0/_2_0/channel/SQSChannelBinding.java | 45 +++ .../SQSChannelDeadLetterQueueIdentifier.java | 42 +++ .../sqs/v0/_2_0/channel/SQSChannelQueue.java | 116 +++++++ .../SQSChannelQueueDeduplicationScope.java | 22 ++ .../SQSChannelQueueFifoThroughputLimit.java | 22 ++ .../_2_0/channel/SQSChannelQueuePolicy.java | 32 ++ .../SQSChannelQueuePolicyStatement.java | 42 +++ .../SQSChannelQueuePolicyStatementEffect.java | 13 + .../_2_0/channel/SQSChannelRedrivePolicy.java | 37 +++ .../v0/_2_0/message/SQSMessageBinding.java | 36 +++ .../_2_0/operation/SQSOperationBinding.java | 44 +++ ...SQSOperationDeadLetterQueueIdentifier.java | 42 +++ .../v0/_2_0/operation/SQSOperationQueue.java | 129 ++++++++ .../SQSOperationQueueDeduplicationScope.java | 22 ++ .../SQSOperationQueueFifoThroughputLimit.java | 22 ++ .../operation/SQSOperationQueuePolicy.java | 32 ++ .../SQSOperationQueuePolicyStatement.java | 42 +++ ...QSOperationQueuePolicyStatementEffect.java | 13 + .../operation/SQSOperationRedrivePolicy.java | 37 +++ .../sqs/v0/_2_0/server/SQSServerBinding.java | 36 +++ .../asyncapi/bindings/sqs/SQSLatestTest.java | 40 +-- .../bindings/sqs/SQSUnknownVersionTest.java | 40 +-- .../asyncapi/bindings/sqs/SQSV0_1_0Test.java | 24 +- .../asyncapi/bindings/sqs/SQSV0_2_0Test.java | 155 +++++++++ .../bindings/sqs/SQSWithoutVersionTest.java | 40 +-- .../v2/_0_0/model/channel/ChannelItemTest.kt | 5 +- .../_0_0/model/channel/message/MessageTest.kt | 5 +- .../model/channel/message/MessageTraitTest.kt | 5 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 3 +- .../v2/_0_0/model/server/ServerTest.kt | 5 +- .../v2/_6_0/model/server/ServerTest.kt | 5 +- .../v3/_0_0/model/server/ServerTest.kt | 7 +- .../sqs/0.1.0/channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../bindings/sqs/0.1.0/channel/binding.json | 3 + .../sqs/0.1.0/message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 9 + .../bindings/sqs/0.1.0/message/binding.json | 3 + .../0.1.0/operation/binding - extended.json | 8 + .../operation/binding - wrongly extended.json | 9 + .../bindings/sqs/0.1.0/operation/binding.json | 3 + .../sqs/0.1.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../bindings/sqs/0.1.0/server/binding.json | 3 + .../sqs/0.2.0/channel/binding - extended.json | 45 +++ .../channel/binding - wrongly extended.json | 48 +++ .../bindings/sqs/0.2.0/channel/binding.json | 42 +++ .../sqs/0.2.0/message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 9 + .../bindings/sqs/0.2.0/message/binding.json | 3 + .../0.2.0/operation/binding - extended.json | 40 +++ .../operation/binding - wrongly extended.json | 40 +++ .../bindings/sqs/0.2.0/operation/binding.json | 34 ++ .../sqs/0.2.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../bindings/sqs/0.2.0/server/binding.json | 3 + .../latest/channel/binding - extended.json | 45 +++ .../channel/binding - wrongly extended.json | 48 +++ .../bindings/sqs/latest/channel/binding.json | 42 +++ .../latest/message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 9 + .../bindings/sqs/latest/message/binding.json | 3 + .../latest/operation/binding - extended.json | 40 +++ .../operation/binding - wrongly extended.json | 40 +++ .../sqs/latest/operation/binding.json | 34 ++ .../sqs/latest/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../bindings/sqs/latest/server/binding.json | 3 + .../channel/binding - extended.json | 45 +++ .../channel/binding - wrongly extended.json | 48 +++ .../sqs/unknown version/channel/binding.json | 42 +++ .../message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 9 + .../sqs/unknown version/message/binding.json | 3 + .../operation/binding - extended.json | 40 +++ .../operation/binding - wrongly extended.json | 40 +++ .../unknown version/operation/binding.json | 34 ++ .../server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../sqs/unknown version/server/binding.json | 3 + .../channel/binding - extended.json | 45 +++ .../channel/binding - wrongly extended.json | 47 +++ .../sqs/without version/channel/binding.json | 41 +++ .../message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 8 + .../sqs/without version/message/binding.json | 1 + .../operation/binding - extended.json | 40 +++ .../operation/binding - wrongly extended.json | 39 +++ .../without version/operation/binding.json | 33 ++ .../server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 8 + .../sqs/without version/server/binding.json | 1 + .../v2/2.0.0/model/asyncapi - extended.json | 294 ++++++++++++++++- .../json/v2/2.0.0/model/asyncapi.json | 297 +++++++++++++++++- .../model/channel/channelItem - extended.json | 177 ++++++++++- .../v2/2.0.0/model/channel/channelItem.json | 183 ++++++++++- .../channel/message/message - extended.json | 2 +- .../message/messageTrait - extended.json | 2 +- .../operation with message - extended.json | 70 ++++- .../operation/operation with message.json | 70 ++++- ... with reference to message - extended.json | 68 +++- .../operation with reference to message.json | 70 ++++- .../operation/operationTrait - extended.json | 34 +- .../channel/operation/operationTrait.json | 35 ++- .../components/components - extended.json | 115 ++++++- .../v2/2.0.0/model/components/components.json | 110 ++++++- .../2.0.0/model/server/server - extended.json | 2 +- .../v2/2.6.0/model/asyncapi - extended.json | 6 +- .../components/components - extended.json | 4 +- .../2.6.0/model/server/server - extended.json | 2 +- .../v3/3.0.0/model/asyncapi - extended.json | 8 +- .../components/components - extended.json | 4 +- .../3.0.0/model/server/server - extended.json | 2 +- .../server with reference - extended.json | 2 +- 119 files changed, 3812 insertions(+), 191 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelDeadLetterQueueIdentifier.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueue.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueDeduplicationScope.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueFifoThroughputLimit.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicy.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatement.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatementEffect.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelRedrivePolicy.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/message/SQSMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationDeadLetterQueueIdentifier.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueue.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueDeduplicationScope.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueFifoThroughputLimit.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicy.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatement.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatementEffect.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationRedrivePolicy.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/server/SQSServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_2_0Test.java create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java index b5816775..5b82eff4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java @@ -6,26 +6,24 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes SQS channel binding. * - * @version 0.1.0 * @see SQS channel binding + * @see SQS * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding.class, + defaultImpl = com.asyncapi.bindings.sqs.v0._2_0.channel.SQSChannelBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding.class, names = { - "0.1.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._2_0.channel.SQSChannelBinding.class, names = { + "0.2.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java index 708f5c77..33d5043d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java @@ -6,26 +6,24 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes SQS message binding. * - * @version 0.1.0 * @see SQS message binding + * @see SQS * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding.class, + defaultImpl = com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding.class, names = { - "0.1.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding.class, names = { + "0.2.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java index f3bd5923..9ae3ca88 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java @@ -6,26 +6,24 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes SQS operation binding. * - * @version 0.1.0 * @see SQS operation binding + * @see SQS * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding.class, + defaultImpl = com.asyncapi.bindings.sqs.v0._2_0.operation.SQSOperationBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding.class, names = { - "0.1.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._2_0.operation.SQSOperationBinding.class, names = { + "0.2.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java index c4c0141c..7c1a98c1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java @@ -6,26 +6,24 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes SQS server binding. * - * @version 0.1.0 * @see SQS server binding + * @see SQS * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding.class, + defaultImpl = com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding.class, names = { - "0.1.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding.class, names = { + "0.2.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java new file mode 100644 index 00000000..6a512a19 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java @@ -0,0 +1,45 @@ +package com.asyncapi.bindings.sqs.v0._2_0.channel; + +import lombok.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Describes SQS channel binding. + * + * @see SQS channel binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SQSChannelBinding extends com.asyncapi.bindings.sqs.SQSChannelBinding { + + /** + * A definition of the queue that will be used as the channel. + */ + @NotNull + private SQSChannelQueue queue = new SQSChannelQueue(); + + /** + * A definition of the queue that will be used for un-processable messages. + */ + @Nullable + private SQSChannelQueue deadLetterQueue; + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelDeadLetterQueueIdentifier.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelDeadLetterQueueIdentifier.java new file mode 100644 index 00000000..46187632 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelDeadLetterQueueIdentifier.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.sqs.v0._2_0.channel; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * A definition of a SQS channel dead letter queue identifier. + *

+ * The SQS queue to use as a dead letter queue (DLQ). + * + * @see SQS channel binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSChannelDeadLetterQueueIdentifier { + + /** + * The target is an ARN. For example, for SQS, the identifier may be an ARN, + * which will be of the form: arn:aws:sqs:{region}:{account-id}:{queueName} + */ + @Nullable + private String arn; + + /** + * The endpoint is identified by a name, which corresponds to an identifying field called name + * of a binding for that protocol on this publish Operation Object. + *

+ * For example, if the protocol is sqs then the name refers to the name field sqs binding. + */ + @Nullable + private String name; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueue.java new file mode 100644 index 00000000..a27b760f --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueue.java @@ -0,0 +1,116 @@ +package com.asyncapi.bindings.sqs.v0._2_0.channel; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Map; + +/** + * A definition of a SQS channel queue. + * + * @see SQS channel binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSChannelQueue { + + /** + * The name of the queue. When an SNS Operation Binding Object references an SQS queue by name, + * the identifier should be the one in this field. + */ + @NotNull + @Builder.Default + private String name = ""; + + /** + * Is this a FIFO queue? + */ + @NotNull + @Builder.Default + private Boolean fifoQueue = false; + + /** + * Specifies whether message deduplication occurs at the message group or queue level. + *

+ * Valid values are messageGroup and queue (default). + */ + @Nullable + @Builder.Default + private SQSChannelQueueDeduplicationScope deduplicationScope = SQSChannelQueueDeduplicationScope.QUEUE; + + /** + * Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. + *

+ * Valid values are perQueue (default) and perMessageGroupId. + */ + @Nullable + @Builder.Default + private SQSChannelQueueFifoThroughputLimit fifoThroughputLimit = SQSChannelQueueFifoThroughputLimit.PER_QUEUE; + + /** + * The number of seconds to delay before a message sent to the queue can be received. used to create a delay queue. + */ + @Nullable + @Builder.Default + @javax.validation.constraints.Min(0) + @javax.validation.constraints.Max(15) + private Integer deliveryDelay = 0; + + /** + * The length of time, in seconds, that a consumer locks a message - hiding it from reads - before it is unlocked and can be read again. + */ + @Nullable + @Builder.Default + @javax.validation.constraints.Min(0) + @javax.validation.constraints.Max(43200) + private Integer visibilityTimeout = 30; + + /** + * Determines if the queue uses short polling or long polling. + *

+ * Set to zero the queue reads available messages and returns immediately. + *

+ * Set to a non-zero integer, long polling waits the specified number of seconds for messages to arrive before returning. + */ + @Nullable + @Builder.Default + private Integer receiveMessageWaitTime = 0; + + /** + * How long to retain a message on the queue in seconds, unless deleted. + */ + @Nullable + @Builder.Default + @javax.validation.constraints.Min(60) + @javax.validation.constraints.Max(1209600) + private Integer messageRetentionPeriod = 345600; + + /** + * Prevent poison pill messages by moving un-processable messages to an SQS dead letter queue. + */ + @Nullable + private SQSChannelRedrivePolicy redrivePolicy; + + /** + * The security policy for the SQS Queue. + */ + @Nullable + private SQSChannelQueuePolicy policy; + + /** + * Key-value pairs that represent AWS tags on the queue. + */ + @Nullable + private Map tags; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueDeduplicationScope.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueDeduplicationScope.java new file mode 100644 index 00000000..dd475a5f --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueDeduplicationScope.java @@ -0,0 +1,22 @@ +package com.asyncapi.bindings.sqs.v0._2_0.channel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Specifies whether message deduplication occurs at the message group or queue level. + * + * @see SQS channel binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +public enum SQSChannelQueueDeduplicationScope { + + @JsonProperty("queue") + QUEUE, + + @JsonProperty("messageGroup") + MESSAGE_GROUP + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueFifoThroughputLimit.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueFifoThroughputLimit.java new file mode 100644 index 00000000..4b1e85c4 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueFifoThroughputLimit.java @@ -0,0 +1,22 @@ +package com.asyncapi.bindings.sqs.v0._2_0.channel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. + * + * @see SQS channel binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +public enum SQSChannelQueueFifoThroughputLimit { + + @JsonProperty("perQueue") + PER_QUEUE, + + @JsonProperty("perMessageGroupId") + PER_MESSAGE_GROUP_ID + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicy.java new file mode 100644 index 00000000..19bca4b5 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicy.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.sqs.v0._2_0.channel; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +/** + * A definition of a SQS channel queue policy. + * + * @see SQS channel binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSChannelQueuePolicy { + + /** + * An array of statement objects, each of which controls a permission for this queue. + */ + @NotNull + private List<@NotNull SQSChannelQueuePolicyStatement> statements; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatement.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatement.java new file mode 100644 index 00000000..1fde7828 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatement.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.sqs.v0._2_0.channel; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; + +/** + * A definition of a SQS channel queue policy statement. + * + * @see SQS channel binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSChannelQueuePolicyStatement { + + /** + * The SQS rule to allow or deny actions. + */ + @NotNull + private SQSChannelQueuePolicyStatementEffect effect; + + /** + * The AWS account or resource ARN that this statement applies to. + */ + @NotNull + private Object principal; + + /** + * The SQS permission being allowed or denied e.g. sqs:ReceiveMessage. + */ + @NotNull + private Object action; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatementEffect.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatementEffect.java new file mode 100644 index 00000000..311bada5 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatementEffect.java @@ -0,0 +1,13 @@ +package com.asyncapi.bindings.sqs.v0._2_0.channel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public enum SQSChannelQueuePolicyStatementEffect { + + @JsonProperty("Allow") + ALLOW, + + @JsonProperty("Deny") + DENY + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelRedrivePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelRedrivePolicy.java new file mode 100644 index 00000000..9ddcb370 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelRedrivePolicy.java @@ -0,0 +1,37 @@ +package com.asyncapi.bindings.sqs.v0._2_0.channel; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Prevent poison pill messages by moving un-processable messages to an SQS dead letter queue. + * + * @see SQS channel binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSChannelRedrivePolicy { + + /** + * The SQS queue to use as a dead letter queue (DLQ). + */ + @NotNull + private SQSChannelDeadLetterQueueIdentifier deadLetterQueue; + + /** + * The number of times a message is delivered to the source queue before being moved to the dead-letter queue. + */ + @Nullable + private Integer maxReceiveCount = 10; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/message/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/message/SQSMessageBinding.java new file mode 100644 index 00000000..79484705 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/message/SQSMessageBinding.java @@ -0,0 +1,36 @@ +package com.asyncapi.bindings.sqs.v0._2_0.message; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes SQS message binding. + * + * @see SQS message binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SQSMessageBinding extends com.asyncapi.bindings.sqs.SQSMessageBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java new file mode 100644 index 00000000..91304fa1 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java @@ -0,0 +1,44 @@ +package com.asyncapi.bindings.sqs.v0._2_0.operation; + +import lombok.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Collections; +import java.util.List; + +/** + * Describes SQS operation binding. + * + * @see SQS operation binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SQSOperationBinding extends com.asyncapi.bindings.sqs.SQSOperationBinding { + + /** + * Queue objects that are either the endpoint for an SNS Operation Binding Object, + * or the deadLetterQueue of the SQS Operation Binding Object. + */ + @NotNull + @Builder.Default + private List<@NotNull SQSOperationQueue> queues = Collections.emptyList(); + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationDeadLetterQueueIdentifier.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationDeadLetterQueueIdentifier.java new file mode 100644 index 00000000..b72dcc64 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationDeadLetterQueueIdentifier.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.sqs.v0._2_0.operation; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * A definition of a SQS channel dead letter queue identifier. + *

+ * The SQS queue to use as a dead letter queue (DLQ). + * + * @see SQS operation binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSOperationDeadLetterQueueIdentifier { + + /** + * The target is an ARN. For example, for SQS, the identifier may be an ARN, + * which will be of the form: arn:aws:sqs:{region}:{account-id}:{queueName} + */ + @Nullable + private String arn; + + /** + * The endpoint is identified by a name, which corresponds to an identifying field called name + * of a binding for that protocol on this publish Operation Object. + *

+ * For example, if the protocol is sqs then the name refers to the name field sqs binding. + */ + @Nullable + private String name; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueue.java new file mode 100644 index 00000000..dd11ad6a --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueue.java @@ -0,0 +1,129 @@ +package com.asyncapi.bindings.sqs.v0._2_0.operation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Map; + +/** + * A definition of a SQS operation queue. + * + * @see SQS operation binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSOperationQueue { + + /** + * Allows for an external definition of a queue. + *

+ * The referenced structure MUST be in the format of a Queue. + *

+ * If there are conflicts between the referenced definition and this Queue's definition, the behavior is undefined. + */ + @Nullable + @JsonProperty("$ref") + private String ref; + + /** + * The name of the queue. + *

+ * When an SNS Operation Binding Object references an SQS queue by name, the identifier should be the one in this field. + */ + @NotNull + @Builder.Default + private String name = ""; + + /** + * Is this a FIFO queue? + */ + @NotNull + @Builder.Default + private Boolean fifoQueue = false; + + /** + * Specifies whether message deduplication occurs at the message group or queue level. + *

+ * Valid values are messageGroup and queue (default). + */ + @Nullable + @Builder.Default + private SQSOperationQueueDeduplicationScope deduplicationScope = SQSOperationQueueDeduplicationScope.QUEUE; + + /** + * Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. + *

+ * Valid values are perQueue (default) and perMessageGroupId. + */ + @Nullable + @Builder.Default + private SQSOperationQueueFifoThroughputLimit fifoThroughputLimit = SQSOperationQueueFifoThroughputLimit.PER_QUEUE; + + /** + * The number of seconds to delay before a message sent to the queue can be received. used to create a delay queue. + */ + @Nullable + @Builder.Default + @javax.validation.constraints.Min(0) + @javax.validation.constraints.Max(15) + private Integer deliveryDelay = 0; + + /** + * The length of time, in seconds, that a consumer locks a message - hiding it from reads - before it is unlocked and can be read again. + */ + @Nullable + @Builder.Default + @javax.validation.constraints.Min(0) + @javax.validation.constraints.Max(43200) + private Integer visibilityTimeout = 30; + + /** + * Determines if the queue uses short polling or long polling. + *

+ * Set to zero the queue reads available messages and returns immediately. + *

+ * Set to a non-zero integer, long polling waits the specified number of seconds for messages to arrive before returning. + */ + @Nullable + @Builder.Default + private Integer receiveMessageWaitTime = 0; + + /** + * How long to retain a message on the queue in seconds, unless deleted. + */ + @Nullable + @Builder.Default + @javax.validation.constraints.Min(60) + @javax.validation.constraints.Max(1209600) + private Integer messageRetentionPeriod = 345600; + + /** + * Prevent poison pill messages by moving un-processable messages to an SQS dead letter queue. + */ + @Nullable + private SQSOperationRedrivePolicy redrivePolicy; + + /** + * The security policy for the SQS Queue. + */ + @Nullable + private SQSOperationQueuePolicy policy; + + /** + * Key-value pairs that represent AWS tags on the queue. + */ + @Nullable + private Map tags; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueDeduplicationScope.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueDeduplicationScope.java new file mode 100644 index 00000000..597ff408 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueDeduplicationScope.java @@ -0,0 +1,22 @@ +package com.asyncapi.bindings.sqs.v0._2_0.operation; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Specifies whether message deduplication occurs at the message group or queue level. + * + * @see SQS operation binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +public enum SQSOperationQueueDeduplicationScope { + + @JsonProperty("queue") + QUEUE, + + @JsonProperty("messageGroup") + MESSAGE_GROUP + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueFifoThroughputLimit.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueFifoThroughputLimit.java new file mode 100644 index 00000000..2d78c4c9 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueFifoThroughputLimit.java @@ -0,0 +1,22 @@ +package com.asyncapi.bindings.sqs.v0._2_0.operation; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. + * + * @see SQS operation binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +public enum SQSOperationQueueFifoThroughputLimit { + + @JsonProperty("perQueue") + PER_QUEUE, + + @JsonProperty("perMessageGroupId") + PER_MESSAGE_GROUP_ID + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicy.java new file mode 100644 index 00000000..8275b8ce --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicy.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.sqs.v0._2_0.operation; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +/** + * A definition of a SQS channel queue policy. + * + * @see SQS operation binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSOperationQueuePolicy { + + /** + * An array of statement objects, each of which controls a permission for this queue. + */ + @NotNull + private List<@NotNull SQSOperationQueuePolicyStatement> statements; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatement.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatement.java new file mode 100644 index 00000000..777f45dc --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatement.java @@ -0,0 +1,42 @@ +package com.asyncapi.bindings.sqs.v0._2_0.operation; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; + +/** + * A definition of a SQS channel queue policy statement. + * + * @see SQS operation binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSOperationQueuePolicyStatement { + + /** + * The SQS rule to allow or deny actions. + */ + @NotNull + private SQSOperationQueuePolicyStatementEffect effect; + + /** + * The AWS account or resource ARN that this statement applies to. + */ + @NotNull + private Object principal; + + /** + * The SQS permission being allowed or denied e.g. sqs:ReceiveMessage. + */ + @NotNull + private Object action; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatementEffect.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatementEffect.java new file mode 100644 index 00000000..03190b13 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatementEffect.java @@ -0,0 +1,13 @@ +package com.asyncapi.bindings.sqs.v0._2_0.operation; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public enum SQSOperationQueuePolicyStatementEffect { + + @JsonProperty("Allow") + ALLOW, + + @JsonProperty("Deny") + DENY + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationRedrivePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationRedrivePolicy.java new file mode 100644 index 00000000..86d46da8 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationRedrivePolicy.java @@ -0,0 +1,37 @@ +package com.asyncapi.bindings.sqs.v0._2_0.operation; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Prevent poison pill messages by moving un-processable messages to an SQS dead letter queue. + * + * @see SQS operation binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SQSOperationRedrivePolicy { + + /** + * The SQS queue to use as a dead letter queue (DLQ). + */ + @NotNull + private SQSOperationDeadLetterQueueIdentifier deadLetterQueue; + + /** + * The number of times a message is delivered to the source queue before being moved to the dead-letter queue. + */ + @Nullable + private Integer maxReceiveCount = 10; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/server/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/server/SQSServerBinding.java new file mode 100644 index 00000000..684d09ae --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/server/SQSServerBinding.java @@ -0,0 +1,36 @@ +package com.asyncapi.bindings.sqs.v0._2_0.server; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. + *

+ * Its name is reserved for future use. + *

+ * Describes SQS server binding. + * + * @see SQS server binding + * @see SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SQSServerBinding extends com.asyncapi.bindings.sqs.SQSServerBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSLatestTest.java index e032e1e5..da1a3b96 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSLatestTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSLatestTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.sqs; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; -import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; -import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; -import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; +import com.asyncapi.bindings.sqs.v0._2_0.channel.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._2_0.operation.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,41 +14,41 @@ public class SQSLatestTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = SQSV0_1_0Test.channelBinding(); + super.binding = SQSV0_2_0Test.channelBinding(); super.bindingTypeClass = SQSChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/latest/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/latest/channel/binding - wrongly extended.json"; }} @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = SQSV0_1_0Test.messageBinding(); + super.binding = SQSV0_2_0Test.messageBinding(); super.bindingTypeClass = SQSMessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/latest/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/latest/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/message/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/latest/message/binding - wrongly extended.json"; }} @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = SQSV0_1_0Test.operationBinding(); + super.binding = SQSV0_2_0Test.operationBinding(); super.bindingTypeClass = SQSOperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/latest/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/latest/operation/binding - wrongly extended.json"; }} @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = SQSV0_1_0Test.serverBinding(); + super.binding = SQSV0_2_0Test.serverBinding(); super.bindingTypeClass = SQSServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/latest/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/latest/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/server/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/latest/server/binding - wrongly extended.json"; }} } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSUnknownVersionTest.java index 5cb3a0f2..97c896d9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSUnknownVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSUnknownVersionTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.sqs; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; -import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; -import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; -import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; +import com.asyncapi.bindings.sqs.v0._2_0.channel.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._2_0.operation.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,41 +14,41 @@ public class SQSUnknownVersionTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = SQSV0_1_0Test.channelBinding(); + super.binding = SQSV0_2_0Test.channelBinding(); super.bindingTypeClass = SQSChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/unknown version/channel/binding - wrongly extended.json"; }} @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = SQSV0_1_0Test.messageBinding(); + super.binding = SQSV0_2_0Test.messageBinding(); super.bindingTypeClass = SQSMessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/unknown version/message/binding - wrongly extended.json"; }} @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = SQSV0_1_0Test.operationBinding(); + super.binding = SQSV0_2_0Test.operationBinding(); super.bindingTypeClass = SQSOperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/unknown version/operation/binding - wrongly extended.json"; }} @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = SQSV0_1_0Test.serverBinding(); + super.binding = SQSV0_2_0Test.serverBinding(); super.bindingTypeClass = SQSServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/unknown version/server/binding - wrongly extended.json"; }} } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_1_0Test.java index e47c2432..33923492 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_1_0Test.java @@ -32,9 +32,9 @@ public static SQSServerBinding serverBinding () { class ChannelTest extends BindingTest {{ super.binding = channelBinding(); super.bindingTypeClass = SQSChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/0.1.0/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/0.1.0/channel/binding - wrongly extended.json"; }} @Nested @@ -42,9 +42,9 @@ class ChannelTest extends BindingTest {{ class Message extends BindingTest {{ super.binding = messageBinding(); super.bindingTypeClass = SQSMessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/0.1.0/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/0.1.0/message/binding - wrongly extended.json"; }} @Nested @@ -52,9 +52,9 @@ class Message extends BindingTest {{ class Operation extends BindingTest {{ super.binding = operationBinding(); super.bindingTypeClass = SQSOperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/0.1.0/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/0.1.0/operation/binding - wrongly extended.json"; }} @Nested @@ -62,9 +62,9 @@ class Operation extends BindingTest {{ class Server extends BindingTest {{ super.binding = serverBinding(); super.bindingTypeClass = SQSServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/0.1.0/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/0.1.0/server/binding - wrongly extended.json"; }} } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_2_0Test.java new file mode 100644 index 00000000..18bf32d4 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSV0_2_0Test.java @@ -0,0 +1,155 @@ +package com.asyncapi.bindings.sqs; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.sqs.v0._2_0.channel.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._2_0.channel.*; +import com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._2_0.operation.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._2_0.operation.*; +import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.LinkedHashMap; +import java.util.List; + +@DisplayName("0.2.0") +public class SQSV0_2_0Test { + + public static SQSChannelBinding channelBinding () { + var tags = new LinkedHashMap(); + tags.put("owner", "AsyncAPI.NET"); + tags.put("platform", "AsyncAPIOrg"); + + return SQSChannelBinding.builder() + .queue(SQSChannelQueue.builder() + .name("myQueue") + .fifoQueue(true) + .deduplicationScope(SQSChannelQueueDeduplicationScope.MESSAGE_GROUP) + .fifoThroughputLimit(SQSChannelQueueFifoThroughputLimit.PER_MESSAGE_GROUP_ID) + .deliveryDelay(15) + .visibilityTimeout(60) + .receiveMessageWaitTime(0) + .messageRetentionPeriod(86400) + .redrivePolicy(SQSChannelRedrivePolicy.builder() + .deadLetterQueue(new SQSChannelDeadLetterQueueIdentifier( + "arn:aws:SQS:eu-west-1:0000000:123456789", null + )) + .maxReceiveCount(15) + .build() + ) + .policy(SQSChannelQueuePolicy.builder() + .statements(List.of( + SQSChannelQueuePolicyStatement.builder() + .effect(SQSChannelQueuePolicyStatementEffect.DENY) + .principal("arn:aws:iam::123456789012:user/dec.kolakowski") + .action(List.of( + "sqs:SendMessage", + "sqs:ReceiveMessage" + )) + .build() + )) + .build() + ) + .tags(tags) + .build() + ) + .deadLetterQueue(SQSChannelQueue.builder() + .name("myQueue_error") + .deliveryDelay(0) + .visibilityTimeout(0) + .receiveMessageWaitTime(0) + .messageRetentionPeriod(604800) + .build() + ) + .build(); + } + + public static SQSMessageBinding messageBinding () { + return new SQSMessageBinding(); + } + + public static SQSOperationBinding operationBinding () { + return SQSOperationBinding.builder() + .queues(List.of( + SQSOperationQueue.builder() + .name("myQueue") + .fifoQueue(true) + .deduplicationScope(SQSOperationQueueDeduplicationScope.MESSAGE_GROUP) + .fifoThroughputLimit(SQSOperationQueueFifoThroughputLimit.PER_MESSAGE_GROUP_ID) + .deliveryDelay(10) + .redrivePolicy(SQSOperationRedrivePolicy.builder() + .deadLetterQueue(new SQSOperationDeadLetterQueueIdentifier( + null, + "myQueue_error" + )) + .maxReceiveCount(15) + .build() + ) + .policy(SQSOperationQueuePolicy.builder() + .statements(List.of( + SQSOperationQueuePolicyStatement.builder() + .effect(SQSOperationQueuePolicyStatementEffect.DENY) + .principal("arn:aws:iam::123456789012:user/dec.kolakowski") + .action(List.of( + "sqs:SendMessage", + "sqs:ReceiveMessage" + )) + .build() + )) + .build() + ) + .build(), + SQSOperationQueue.builder() + .name("myQueue_error") + .deliveryDelay(10) + .build() + )) + .build(); + } + + public static SQSServerBinding serverBinding () { + return new SQSServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = SQSChannelBinding.class; + super.pathToBindingJson = "/bindings/sqs/0.2.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/0.2.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/0.2.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = SQSMessageBinding.class; + super.pathToBindingJson = "/bindings/sqs/0.2.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/0.2.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/0.2.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = SQSOperationBinding.class; + super.pathToBindingJson = "/bindings/sqs/0.2.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/0.2.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/0.2.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = SQSServerBinding.class; + super.pathToBindingJson = "/bindings/sqs/0.2.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/0.2.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/0.2.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSWithoutVersionTest.java index a5c1a445..28540ecd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSWithoutVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sqs/SQSWithoutVersionTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.sqs; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding; -import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding; -import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding; -import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding; +import com.asyncapi.bindings.sqs.v0._2_0.channel.SQSChannelBinding; +import com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding; +import com.asyncapi.bindings.sqs.v0._2_0.operation.SQSOperationBinding; +import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,41 +14,41 @@ public class SQSWithoutVersionTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = SQSV0_1_0Test.channelBinding(); + super.binding = SQSV0_2_0Test.channelBinding(); super.bindingTypeClass = SQSChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/without version/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/without version/channel/binding - wrongly extended.json"; }} @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = SQSV0_1_0Test.messageBinding(); + super.binding = SQSV0_2_0Test.messageBinding(); super.bindingTypeClass = SQSMessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/without version/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/without version/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/message/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/without version/message/binding - wrongly extended.json"; }} @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = SQSV0_1_0Test.operationBinding(); + super.binding = SQSV0_2_0Test.operationBinding(); super.bindingTypeClass = SQSOperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/without version/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/without version/operation/binding - wrongly extended.json"; }} @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = SQSV0_1_0Test.serverBinding(); + super.binding = SQSV0_2_0Test.serverBinding(); super.bindingTypeClass = SQSServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/without version/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/without version/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/server/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sqs/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sqs/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sqs/without version/server/binding - wrongly extended.json"; }} } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 87e5f7f4..85849610 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -21,7 +21,8 @@ import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding -import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding +import com.asyncapi.bindings.sqs.SQSV0_2_0Test +import com.asyncapi.bindings.sqs.v0._2_0.channel.SQSChannelBinding import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding import com.asyncapi.bindings.websockets.WebSocketsV0_1_0Test @@ -71,7 +72,7 @@ class ChannelItemTest: SerDeTest() { Pair("redis", RedisChannelBinding()), Pair("sns", SNSChannelBinding()), Pair("solace", SolaceChannelBinding()), - Pair("sqs", SQSChannelBinding()), + Pair("sqs", SQSV0_2_0Test.channelBinding()), Pair("stomp", STOMPChannelBinding()), Pair("ws", WebSocketsV0_1_0Test.channelBinding()) ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 5bd5925e..989f60de 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -22,7 +22,8 @@ import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding -import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding +import com.asyncapi.bindings.sqs.SQSV0_2_0Test +import com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding @@ -132,7 +133,7 @@ class MessageTest: SerDeTest() { Pair("redis", RedisMessageBinding()), Pair("sns", SNSMessageBinding()), Pair("solace", SolaceMessageBinding()), - Pair("sqs", SQSMessageBinding()), + Pair("sqs", SQSV0_2_0Test.messageBinding()), Pair("stomp", STOMPMessageBinding()), Pair("ws", WebSocketsMessageBinding()) ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 00fd88e5..ffbcd724 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -20,7 +20,8 @@ import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding -import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding +import com.asyncapi.bindings.sqs.SQSV0_2_0Test +import com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding @@ -90,7 +91,7 @@ class MessageTraitTest: SerDeTest() { Pair("redis", RedisMessageBinding()), Pair("sns", SNSMessageBinding()), Pair("solace", SolaceMessageBinding()), - Pair("sqs", SQSMessageBinding()), + Pair("sqs", SQSV0_2_0Test.messageBinding()), Pair("stomp", STOMPMessageBinding()), Pair("ws", WebSocketsMessageBinding()) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index c2fc29e3..730ab651 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -22,7 +22,7 @@ import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding import com.asyncapi.bindings.solace.SolaceV0_3_0Test -import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding +import com.asyncapi.bindings.sqs.SQSV0_2_0Test import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding @@ -117,7 +117,7 @@ class OperationTest { Pair("redis", RedisOperationBinding()), Pair("sns", SNSOperationBinding()), Pair("solace", SolaceV0_3_0Test.operationBinding()), - Pair("sqs", SQSOperationBinding()), + Pair("sqs", SQSV0_2_0Test.operationBinding()), Pair("stomp", STOMPOperationBinding()), Pair("ws", WebSocketsOperationBinding()) ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 4fc27036..ca18aeaf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -19,6 +19,7 @@ import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding import com.asyncapi.bindings.solace.SolaceV0_3_0Test +import com.asyncapi.bindings.sqs.SQSV0_2_0Test import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding @@ -66,7 +67,7 @@ class OperationTraitTest: SerDeTest() { Pair("redis", RedisOperationBinding()), Pair("sns", SNSOperationBinding()), Pair("solace", SolaceV0_3_0Test.operationBinding()), - Pair("sqs", SQSOperationBinding()), + Pair("sqs", SQSV0_2_0Test.operationBinding()), Pair("stomp", STOMPOperationBinding()), Pair("ws", WebSocketsOperationBinding()) )) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 58c954b8..914c134c 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -18,7 +18,8 @@ import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding -import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding +import com.asyncapi.bindings.sqs.SQSV0_2_0Test +import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding @@ -117,7 +118,7 @@ class ServerTest: SerDeTest() { .msgVpn("solace.private.net") .build() ), - Pair("sqs", SQSServerBinding()), + Pair("sqs", SQSV0_2_0Test.serverBinding()), Pair("stomp", STOMPServerBinding()), Pair("ws", WebSocketsServerBinding()), ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index 8a6c5150..f5edfa42 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -19,7 +19,8 @@ import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding -import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding +import com.asyncapi.bindings.sqs.SQSV0_2_0Test +import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding @@ -128,7 +129,7 @@ class ServerTest: SerDeTest() { .msgVpn("solace.private.net") .build() ), - Pair("sqs", SQSServerBinding()), + Pair("sqs", SQSV0_2_0Test.serverBinding()), Pair("stomp", STOMPServerBinding()), Pair("ws", WebSocketsServerBinding()), ) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 80e9fbf5..aa72f2e2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -20,7 +20,8 @@ import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding -import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding +import com.asyncapi.bindings.sqs.SQSV0_2_0Test +import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding import com.asyncapi.schemas.security.v3.ApiKeySecuritySchemeTest @@ -138,7 +139,7 @@ class ServerTest: SerDeTest() { .msgVpn("solace.private.net") .build() ), - Pair("sqs", SQSServerBinding()), + Pair("sqs", SQSV0_2_0Test.serverBinding()), Pair("stomp", STOMPServerBinding()), Pair("ws", WebSocketsServerBinding()), ) @@ -257,7 +258,7 @@ class ServerTestWithReference: SerDeTest() { .msgVpn("solace.private.net") .build() ), - Pair("sqs", SQSServerBinding()), + Pair("sqs", SQSV0_2_0Test.serverBinding()), Pair("stomp", STOMPServerBinding()), Pair("ws", WebSocketsServerBinding()), ) diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/operation/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.1.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding - extended.json new file mode 100644 index 00000000..713f4911 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding - extended.json @@ -0,0 +1,45 @@ +{ + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..9f5e540f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding - wrongly extended.json @@ -0,0 +1,48 @@ +{ + "queue": { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 15, + "visibilityTimeout": 60, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 86400, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + }, + "tags": { + "owner": "AsyncAPI.NET", + "platform": "AsyncAPIOrg" + } + }, + "deadLetterQueue": { + "name": "myQueue_error", + "deliveryDelay": 0, + "visibilityTimeout": 0, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 604800 + }, + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding.json new file mode 100644 index 00000000..e7bda09d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/channel/binding.json @@ -0,0 +1,42 @@ +{ + "queue": { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 15, + "visibilityTimeout": 60, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 86400, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + }, + "tags": { + "owner": "AsyncAPI.NET", + "platform": "AsyncAPIOrg" + } + }, + "deadLetterQueue": { + "name": "myQueue_error", + "deliveryDelay": 0, + "visibilityTimeout": 0, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 604800 + }, + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding - extended.json new file mode 100644 index 00000000..d953c2be --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding - extended.json @@ -0,0 +1,40 @@ +{ + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..89f6c964 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding - wrongly extended.json @@ -0,0 +1,40 @@ +{ + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding.json new file mode 100644 index 00000000..cb6af7b3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/operation/binding.json @@ -0,0 +1,34 @@ +{ + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/0.2.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding - extended.json new file mode 100644 index 00000000..713f4911 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding - extended.json @@ -0,0 +1,45 @@ +{ + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..7a58a793 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding - wrongly extended.json @@ -0,0 +1,48 @@ +{ + "queue": { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 15, + "visibilityTimeout": 60, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 86400, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + }, + "tags": { + "owner": "AsyncAPI.NET", + "platform": "AsyncAPIOrg" + } + }, + "deadLetterQueue": { + "name": "myQueue_error", + "deliveryDelay": 0, + "visibilityTimeout": 0, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 604800 + }, + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding.json new file mode 100644 index 00000000..e860a7d5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/channel/binding.json @@ -0,0 +1,42 @@ +{ + "queue": { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 15, + "visibilityTimeout": 60, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 86400, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + }, + "tags": { + "owner": "AsyncAPI.NET", + "platform": "AsyncAPIOrg" + } + }, + "deadLetterQueue": { + "name": "myQueue_error", + "deliveryDelay": 0, + "visibilityTimeout": 0, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 604800 + }, + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding - extended.json new file mode 100644 index 00000000..d953c2be --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding - extended.json @@ -0,0 +1,40 @@ +{ + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0247140c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding - wrongly extended.json @@ -0,0 +1,40 @@ +{ + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding.json new file mode 100644 index 00000000..211291e7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/operation/binding.json @@ -0,0 +1,34 @@ +{ + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/latest/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..713f4911 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding - extended.json @@ -0,0 +1,45 @@ +{ + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..0c4bc1dd --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,48 @@ +{ + "queue": { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 15, + "visibilityTimeout": 60, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 86400, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + }, + "tags": { + "owner": "AsyncAPI.NET", + "platform": "AsyncAPIOrg" + } + }, + "deadLetterQueue": { + "name": "myQueue_error", + "deliveryDelay": 0, + "visibilityTimeout": 0, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 604800 + }, + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding.json new file mode 100644 index 00000000..75704365 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/channel/binding.json @@ -0,0 +1,42 @@ +{ + "queue": { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 15, + "visibilityTimeout": 60, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 86400, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + }, + "tags": { + "owner": "AsyncAPI.NET", + "platform": "AsyncAPIOrg" + } + }, + "deadLetterQueue": { + "name": "myQueue_error", + "deliveryDelay": 0, + "visibilityTimeout": 0, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 604800 + }, + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..d953c2be --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding - extended.json @@ -0,0 +1,40 @@ +{ + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..03c37a16 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,40 @@ +{ + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding.json new file mode 100644 index 00000000..bc70030b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/operation/binding.json @@ -0,0 +1,34 @@ +{ + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/unknown version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding - extended.json new file mode 100644 index 00000000..713f4911 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding - extended.json @@ -0,0 +1,45 @@ +{ + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..dbd71da9 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding - wrongly extended.json @@ -0,0 +1,47 @@ +{ + "queue": { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 15, + "visibilityTimeout": 60, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 86400, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + }, + "tags": { + "owner": "AsyncAPI.NET", + "platform": "AsyncAPIOrg" + } + }, + "deadLetterQueue": { + "name": "myQueue_error", + "deliveryDelay": 0, + "visibilityTimeout": 0, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 604800 + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding.json new file mode 100644 index 00000000..ee3828a2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/channel/binding.json @@ -0,0 +1,41 @@ +{ + "queue": { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 15, + "visibilityTimeout": 60, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 86400, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + }, + "tags": { + "owner": "AsyncAPI.NET", + "platform": "AsyncAPIOrg" + } + }, + "deadLetterQueue": { + "name": "myQueue_error", + "deliveryDelay": 0, + "visibilityTimeout": 0, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 604800 + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/message/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding - extended.json new file mode 100644 index 00000000..d953c2be --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding - extended.json @@ -0,0 +1,40 @@ +{ + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..9a2529f7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding - wrongly extended.json @@ -0,0 +1,39 @@ +{ + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding.json new file mode 100644 index 00000000..f4d6c740 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/operation/binding.json @@ -0,0 +1,33 @@ +{ + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ] +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sqs/without version/server/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 5fc2bda2..9606aaef 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -103,7 +103,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -238,7 +238,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -370,7 +402,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -505,7 +569,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -637,7 +733,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -779,7 +907,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -925,7 +1053,44 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -1118,7 +1283,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -1381,7 +1546,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -1514,7 +1711,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -1606,7 +1803,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -1724,7 +1921,44 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -1857,7 +2091,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -1952,7 +2218,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json index ab1af5c9..62481d7d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json @@ -203,7 +203,41 @@ } ], "bindingVersion" : "0.3.0" }, - "sqs" : { }, + "sqs" : { + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" + }, "stomp" : { }, "ws" : { } }, @@ -330,7 +364,41 @@ ], "bindingVersion": "0.3.0" }, - "sqs": {}, + "sqs": { + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" + }, "stomp": {}, "ws": {} } @@ -446,7 +514,41 @@ } ], "bindingVersion" : "0.3.0" }, - "sqs" : { }, + "sqs" : { + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" + }, "stomp" : { }, "ws" : { } }, @@ -573,7 +675,41 @@ ], "bindingVersion": "0.3.0" }, - "sqs": { }, + "sqs": { + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" + }, "stomp": { }, "ws": { } } @@ -834,7 +970,46 @@ "redis": { }, "sns": { }, "solace": { }, - "sqs": { }, + "sqs": { + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0" + }, "stomp": { }, "ws": { "method": "GET", @@ -1264,7 +1439,41 @@ ], "bindingVersion": "0.3.0" }, - "sqs": {}, + "sqs": { + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" + }, "stomp": {}, "ws": {} } @@ -1554,7 +1763,46 @@ "redis": { }, "sns": { }, "solace": { }, - "sqs": { }, + "sqs": { + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0" + }, "stomp": { }, "ws": { "method": "GET", @@ -1666,7 +1914,40 @@ } ], "bindingVersion" : "0.3.0" }, - "sqs" : { }, + "sqs" : { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp" : { }, "ws" : { } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 5372e9d2..6ced5ac9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -121,7 +121,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -253,7 +285,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -388,7 +452,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -520,7 +616,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -662,7 +790,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -808,7 +936,44 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json index 747df167..2ceccefc 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json @@ -106,7 +106,40 @@ } ], "bindingVersion" : "0.3.0" }, - "sqs" : { }, + "sqs" : { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp" : { }, "ws" : { } }, @@ -233,7 +266,40 @@ ], "bindingVersion": "0.3.0" }, - "sqs": {}, + "sqs": { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp": {}, "ws": {} } @@ -349,7 +415,40 @@ } ], "bindingVersion" : "0.3.0" }, - "sqs" : { }, + "sqs" : { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp" : { }, "ws" : { } }, @@ -476,7 +575,40 @@ ], "bindingVersion": "0.3.0" }, - "sqs": { }, + "sqs": { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp": { }, "ws": { } } @@ -737,7 +869,48 @@ "redis": { }, "sns": { }, "solace": { }, - "sqs": { }, + "sqs": { + "queue": { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 15, + "visibilityTimeout": 60, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 86400, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + }, + "tags": { + "owner": "AsyncAPI.NET", + "platform": "AsyncAPIOrg" + } + }, + "deadLetterQueue": { + "name": "myQueue_error", + "deliveryDelay": 0, + "visibilityTimeout": 0, + "receiveMessageWaitTime": 0, + "messageRetentionPeriod": 604800 + }, + "bindingVersion": "0.2.0" + }, "stomp": { }, "ws": { "method": "GET", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index ccbfc53f..414c5865 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -130,7 +130,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 344aeca2..4bb389e4 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -119,7 +119,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index a682656d..aec07294 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -119,7 +119,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -251,7 +283,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -393,7 +457,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json index 3eb3eacf..d141b5dc 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json @@ -104,7 +104,40 @@ } ], "bindingVersion" : "0.3.0" }, - "sqs" : { }, + "sqs" : { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp" : { }, "ws" : { } }, @@ -231,7 +264,40 @@ ], "bindingVersion": "0.3.0" }, - "sqs": { }, + "sqs": { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp": { }, "ws": { } } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index b0c92230..2b10a400 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -119,7 +119,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -251,7 +283,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json index b22c1e9c..a8bda938 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json @@ -104,7 +104,40 @@ } ], "bindingVersion" : "0.3.0" }, - "sqs" : { }, + "sqs" : { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp" : { }, "ws" : { } }, @@ -231,7 +264,40 @@ ], "bindingVersion": "0.3.0" }, - "sqs": {}, + "sqs": { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp": {}, "ws": {} } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index de86aaa3..eac3ca85 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -119,7 +119,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json index f35b6bf6..b33074c5 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json @@ -117,7 +117,40 @@ ], "bindingVersion": "0.3.0" }, - "sqs": {}, + "sqs": { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp": {}, "ws": {} } diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 2990e7e1..5473edbe 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -161,7 +161,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -424,7 +424,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -557,7 +589,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -649,7 +681,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -767,7 +799,44 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + }, + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -900,7 +969,39 @@ } ] }, "sqs" : { - "bindingVersion" : "0.1.0" + "queues" : [ { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600, + "redrivePolicy" : { + "deadLetterQueue" : { + "name" : "myQueue_error" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + } + }, { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 10, + "visibilityTimeout" : 30, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 345600 + } ], + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -995,7 +1096,7 @@ "bindingVersion" : "0.3.0" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json index fd2c807f..e68e8221 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json @@ -402,7 +402,40 @@ ], "bindingVersion": "0.3.0" }, - "sqs": {}, + "sqs": { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp": {}, "ws": {} } @@ -692,7 +725,45 @@ "redis": { }, "sns": { }, "solace": { }, - "sqs": { }, + "sqs": { + "queue" : { + "name" : "myQueue", + "fifoQueue" : true, + "deduplicationScope" : "messageGroup", + "fifoThroughputLimit" : "perMessageGroupId", + "deliveryDelay" : 15, + "visibilityTimeout" : 60, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 86400, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 15 + }, + "policy" : { + "statements" : [ { + "effect" : "Deny", + "principal" : "arn:aws:iam::123456789012:user/dec.kolakowski", + "action" : [ "sqs:SendMessage", "sqs:ReceiveMessage" ] + } ] + }, + "tags" : { + "owner" : "AsyncAPI.NET", + "platform" : "AsyncAPIOrg" + } + }, + "deadLetterQueue" : { + "name" : "myQueue_error", + "fifoQueue" : false, + "deduplicationScope" : "queue", + "fifoThroughputLimit" : "perQueue", + "deliveryDelay" : 0, + "visibilityTimeout" : 0, + "receiveMessageWaitTime" : 0, + "messageRetentionPeriod" : 604800 + } + }, "stomp": { }, "ws": { "method": "GET", @@ -804,7 +875,40 @@ } ], "bindingVersion" : "0.3.0" }, - "sqs" : { }, + "sqs" : { + "queues": [ + { + "name": "myQueue", + "fifoQueue": true, + "deduplicationScope": "messageGroup", + "fifoThroughputLimit": "perMessageGroupId", + "deliveryDelay": 10, + "redrivePolicy": { + "deadLetterQueue": { + "name": "myQueue_error" + }, + "maxReceiveCount": 15 + }, + "policy": { + "statements": [ + { + "effect": "Deny", + "principal": "arn:aws:iam::123456789012:user/dec.kolakowski", + "action": [ + "sqs:SendMessage", + "sqs:ReceiveMessage" + ] + } + ] + } + }, + { + "name": "myQueue_error", + "deliveryDelay": 10 + } + ], + "bindingVersion": "0.2.0" + }, "stomp" : { }, "ws" : { } }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index 04385680..ecad218f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -83,7 +83,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 23e24fe3..f068e5ff 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -112,7 +112,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -1273,7 +1273,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -2967,7 +2967,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index ed1750fb..d2cdf70e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -124,7 +124,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -1818,7 +1818,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 4d865242..6fc3f3c3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -93,7 +93,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 9ad72d8d..66186e96 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -139,7 +139,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -261,7 +261,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -5165,7 +5165,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -12634,7 +12634,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index 71aeae19..36e396b3 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -141,7 +141,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" @@ -7610,7 +7610,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 6213946e..c709bd24 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -107,7 +107,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index b76f7484..9b419c86 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -110,7 +110,7 @@ "msgVpn" : "solace.private.net" }, "sqs" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "stomp" : { "bindingVersion" : "0.1.0" From 82f1122eb3185e5586331d758cd5d5aea26b7f85 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sat, 11 May 2024 17:37:58 +0400 Subject: [PATCH 099/141] feat(bindings): Solace 0.1.0, 0.2.0, 0.3.0, 0.4.0 --- .../bindings/solace/SolaceChannelBinding.java | 15 +- .../bindings/solace/SolaceMessageBinding.java | 15 +- .../solace/SolaceOperationBinding.java | 17 +- .../bindings/solace/SolaceServerBinding.java | 9 +- .../v0/_1_0/channel/SolaceChannelBinding.java | 34 ++ .../v0/_1_0/message/SolaceMessageBinding.java | 34 ++ .../operation/SolaceOperationBinding.java | 34 ++ .../v0/_1_0/server/SolaceServerBinding.java | 32 ++ .../v0/_2_0/channel/SolaceChannelBinding.java | 34 ++ .../v0/_2_0/message/SolaceMessageBinding.java | 34 ++ .../operation/SolaceOperationBinding.java | 48 ++ .../operation/SolaceOperationDestination.java | 86 ++++ .../operation/queue/SolaceOperationQueue.java | 66 +++ .../v0/_2_0/server/SolaceServerBinding.java | 44 ++ .../v0/_3_0/channel/SolaceChannelBinding.java | 1 - .../v0/_3_0/message/SolaceMessageBinding.java | 1 - .../operation/SolaceOperationDestination.java | 11 +- .../operation/queue/SolaceOperationQueue.java | 2 +- .../operation/topic/SolaceOperationTopic.java | 39 -- .../v0/_4_0/channel/SolaceChannelBinding.java | 35 ++ .../v0/_4_0/message/SolaceMessageBinding.java | 35 ++ .../operation/SolaceOperationBinding.java | 71 +++ .../operation/SolaceOperationDestination.java | 84 ++++ .../operation/queue/SolaceOperationQueue.java | 82 ++++ .../v0/_4_0/server/SolaceServerBinding.java | 54 +++ .../bindings/solace/SolaceLatestTest.java | 16 +- .../solace/SolaceUnknownVersionTest.java | 16 +- .../bindings/solace/SolaceV0_1_0Test.java | 70 +++ .../bindings/solace/SolaceV0_2_0Test.java | 90 ++++ .../bindings/solace/SolaceV0_3_0Test.java | 13 +- .../bindings/solace/SolaceV0_4_0Test.java | 93 ++++ .../solace/SolaceWithoutVersionTest.java | 16 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 3 +- .../_0_0/model/channel/message/MessageTest.kt | 3 +- .../model/channel/message/MessageTraitTest.kt | 3 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_0_0/model/server/ServerTest.kt | 12 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_6_0/model/server/ServerTest.kt | 12 +- .../v3/_0_0/model/operation/OperationTest.kt | 6 +- .../model/operation/OperationTraitTest.kt | 6 +- .../v3/_0_0/model/server/ServerTest.kt | 21 +- .../0.2.0/channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../solace/0.2.0/channel/binding.json | 3 + .../0.2.0/message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 9 + .../solace/0.2.0/message/binding.json | 3 + .../0.2.0/operation/binding - extended.json | 21 + .../operation/binding - wrongly extended.json | 27 ++ .../solace/0.2.0/operation/binding.json | 21 + .../0.2.0/server/binding - extended.json | 9 + .../server/binding - wrongly extended.json | 10 + .../bindings/solace/0.2.0/server/binding.json | 4 + .../0.3.0/operation/binding - extended.json | 10 +- .../operation/binding - wrongly extended.json | 16 +- .../solace/0.3.0/operation/binding.json | 16 +- .../0.4.0/channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../solace/0.4.0/channel/binding.json | 3 + .../0.4.0/message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 9 + .../solace/0.4.0/message/binding.json | 3 + .../0.4.0/operation/binding - extended.json | 22 + .../operation/binding - wrongly extended.json | 27 ++ .../solace/0.4.0/operation/binding.json | 21 + .../0.4.0/server/binding - extended.json | 10 + .../server/binding - wrongly extended.json | 11 + .../bindings/solace/0.4.0/server/binding.json | 5 + .../latest/channel/binding - extended.json | 2 +- .../latest/message/binding - extended.json | 2 +- .../latest/operation/binding - extended.json | 21 +- .../operation/binding - wrongly extended.json | 24 +- .../solace/latest/operation/binding.json | 24 +- .../latest/server/binding - extended.json | 5 +- .../server/binding - wrongly extended.json | 5 +- .../solace/latest/server/binding.json | 3 +- .../channel/binding - extended.json | 2 +- .../message/binding - extended.json | 2 +- .../operation/binding - extended.json | 21 +- .../operation/binding - wrongly extended.json | 24 +- .../unknown version/operation/binding.json | 24 +- .../server/binding - extended.json | 5 +- .../server/binding - wrongly extended.json | 4 +- .../unknown version/server/binding.json | 3 +- .../channel/binding - extended.json | 2 +- .../channel/binding - wrongly extended.json | 1 - .../without version/channel/binding.json | 4 +- .../message/binding - extended.json | 2 +- .../message/binding - wrongly extended.json | 1 - .../without version/message/binding.json | 4 +- .../operation/binding - extended.json | 21 +- .../operation/binding - wrongly extended.json | 25 +- .../without version/operation/binding.json | 27 +- .../server/binding - extended.json | 5 +- .../server/binding - wrongly extended.json | 4 +- .../without version/server/binding.json | 4 +- .../v2/2.0.0/model/asyncapi - extended.json | 148 +++---- .../json/v2/2.0.0/model/asyncapi.json | 213 ++++----- .../model/channel/channelItem - extended.json | 88 ++-- .../channelItem - wrongly extended.json | 142 ++---- .../v2/2.0.0/model/channel/channelItem.json | 142 ++---- .../channel/message/message - extended.json | 2 +- .../message/messageTrait - extended.json | 2 +- .../operation with message - extended.json | 44 +- ...ation with message - wrongly extended.json | 71 +-- .../operation/operation with message.json | 71 +-- ... with reference to message - extended.json | 42 +- ...ference to message - wrongly extended.json | 71 +-- .../operation with reference to message.json | 71 +-- .../operation/operationTrait - extended.json | 21 +- .../operationTrait - wrongly extended.json | 42 +- .../channel/operation/operationTrait.json | 42 +- .../components/components - extended.json | 55 +-- .../v2/2.0.0/model/components/components.json | 72 ++- .../2.0.0/model/server/server - extended.json | 5 +- .../json/v2/2.0.0/model/server/server.json | 5 +- .../v2/2.6.0/model/asyncapi - extended.json | 225 ++++------ .../json/v2/2.6.0/model/asyncapi.json | 275 ++++-------- .../model/channel/channelItem - extended.json | 84 ++-- .../channelItem - wrongly extended.json | 168 +++---- .../v2/2.6.0/model/channel/channelItem.json | 168 +++---- .../operation with message - extended.json | 42 +- ...ation with message - wrongly extended.json | 84 ++-- .../operation/operation with message.json | 84 ++-- ...eration with oneOf message - extended.json | 42 +- ...with oneOf message - wrongly extended.json | 84 ++-- .../operation with oneOf message.json | 84 ++-- ... with reference to message - extended.json | 42 +- ...ference to message - wrongly extended.json | 84 ++-- .../operation with reference to message.json | 84 ++-- .../operation/operationTrait - extended.json | 21 +- .../operationTrait - wrongly extended.json | 42 +- .../channel/operation/operationTrait.json | 42 +- .../components/components - extended.json | 136 ++---- .../components - wrongly extended.json | 262 ++++------- .../v2/2.6.0/model/components/components.json | 262 ++++------- .../2.6.0/model/server/server - extended.json | 5 +- .../json/v2/2.6.0/model/server/server.json | 5 +- .../v3/3.0.0/model/asyncapi - extended.json | 335 +++++--------- .../json/v3/3.0.0/model/asyncapi.json | 410 ++++++------------ .../components/components - extended.json | 199 +++------ .../v3/3.0.0/model/components/components.json | 244 ++++------- .../model/operation/operation - extended.json | 63 +-- .../operation - wrongly extended.json | 126 ++---- .../operation with reference - extended.json | 63 +-- ...ion with reference - wrongly extended.json | 42 +- .../operation/operation with reference.json | 126 ++---- .../v3/3.0.0/model/operation/operation.json | 126 ++---- .../operation/operationTrait - extended.json | 21 +- .../operationTrait - wrongly extended.json | 42 +- ...rationTrait with reference - extended.json | 21 +- ...ait with reference - wrongly extended.json | 42 +- .../operationTrait with reference.json | 42 +- .../3.0.0/model/operation/operationTrait.json | 42 +- .../3.0.0/model/server/server - extended.json | 5 +- .../server with reference - extended.json | 5 +- .../model/server/server with reference.json | 5 +- .../json/v3/3.0.0/model/server/server.json | 5 +- 161 files changed, 3453 insertions(+), 4079 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/channel/SolaceChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/message/SolaceMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/operation/SolaceOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/server/SolaceServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/channel/SolaceChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/message/SolaceMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationDestination.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/queue/SolaceOperationQueue.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/server/SolaceServerBinding.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/topic/SolaceOperationTopic.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/channel/SolaceChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/message/SolaceMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationDestination.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/queue/SolaceOperationQueue.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/server/SolaceServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_2_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_4_0Test.java create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java index 74efa092..b1a1a211 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java @@ -7,24 +7,27 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Solace channel binding. * - * @version 0.3.0 * @see Solace channel binding + * @see Solace * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding.class, + defaultImpl = com.asyncapi.bindings.solace.v0._4_0.channel.SolaceChannelBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding.class, names = { - "0.3.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._1_0.channel.SolaceChannelBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._2_0.channel.SolaceChannelBinding.class, names = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding.class, names = "0.3.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._4_0.channel.SolaceChannelBinding.class, names = { + "0.4.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java index ea62c6db..b53f81a9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java @@ -7,24 +7,27 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Solace message binding. * - * @version 0.3.0 * @see Solace message binding + * @see Solace * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding.class, + defaultImpl = com.asyncapi.bindings.solace.v0._4_0.message.SolaceMessageBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding.class, names = { - "0.3.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._1_0.message.SolaceMessageBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._2_0.message.SolaceMessageBinding.class, names = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding.class, names = "0.3.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._4_0.message.SolaceMessageBinding.class, names = { + "0.4.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java index a14c1f3e..f8961d78 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java @@ -8,23 +8,26 @@ /** * Describes Solace operation binding. - *

- * Contains information about the operation representation in Solace PubSub+ Broker. * - * @version 0.3.0 * @see Solace operation binding - * @author Dennis Brinley, Pavel Bodiachevskii + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding.class, + defaultImpl = com.asyncapi.bindings.solace.v0._4_0.operation.SolaceOperationBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding.class, names = { - "0.3.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._1_0.operation.SolaceOperationBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._2_0.operation.SolaceOperationBinding.class, names = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding.class, names = "0.3.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._4_0.operation.SolaceOperationBinding.class, names = { + "0.4.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java index 47f31187..32901da3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java @@ -16,13 +16,16 @@ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding.class, + defaultImpl = com.asyncapi.bindings.solace.v0._4_0.server.SolaceServerBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding.class, names = { - "0.3.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._1_0.server.SolaceServerBinding.class, names = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._2_0.server.SolaceServerBinding.class, names = "0.2.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding.class, names = "0.3.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.solace.v0._4_0.server.SolaceServerBinding.class, names = { + "0.4.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/channel/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/channel/SolaceChannelBinding.java new file mode 100644 index 00000000..48db408f --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/channel/SolaceChannelBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.solace.v0._1_0.channel; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Solace channel binding. + * + * @see Solace channel binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceChannelBinding extends com.asyncapi.bindings.solace.SolaceChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/message/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/message/SolaceMessageBinding.java new file mode 100644 index 00000000..03dc9081 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/message/SolaceMessageBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.solace.v0._1_0.message; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Solace message binding. + * + * @see Solace message binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceMessageBinding extends com.asyncapi.bindings.solace.SolaceMessageBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/operation/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/operation/SolaceOperationBinding.java new file mode 100644 index 00000000..6d85387c --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/operation/SolaceOperationBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.solace.v0._1_0.operation; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Solace operation binding. + *

+ * Contains information about the operation representation in Solace PubSub+ Broker. + * + * @see Solace operation binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceOperationBinding extends com.asyncapi.bindings.solace.SolaceOperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/server/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/server/SolaceServerBinding.java new file mode 100644 index 00000000..7c1ea9b0 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_1_0/server/SolaceServerBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.solace.v0._1_0.server; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Solace server binding. + * + * @see Solace server binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceServerBinding extends com.asyncapi.bindings.solace.SolaceServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/channel/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/channel/SolaceChannelBinding.java new file mode 100644 index 00000000..c45dfb13 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/channel/SolaceChannelBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.solace.v0._2_0.channel; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Solace channel binding. + * + * @see Solace channel binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceChannelBinding extends com.asyncapi.bindings.solace.SolaceChannelBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/message/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/message/SolaceMessageBinding.java new file mode 100644 index 00000000..966ed6b7 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/message/SolaceMessageBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.solace.v0._2_0.message; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Solace message binding. + * + * @see Solace message binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceMessageBinding extends com.asyncapi.bindings.solace.SolaceMessageBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationBinding.java new file mode 100644 index 00000000..f471b238 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationBinding.java @@ -0,0 +1,48 @@ +package com.asyncapi.bindings.solace.v0._2_0.operation; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * Describes Solace operation binding. + *

+ * Contains information about the operation representation in Solace PubSub+ Broker. + * + * @see Solace operation binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes Solace operation binding.") +public class SolaceOperationBinding extends com.asyncapi.bindings.solace.SolaceOperationBinding { + + /** + * List of destinations + */ + @Nullable + @JsonProperty("destinations") + @JsonPropertyDescription("List of destinations") + private List destinations; + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationDestination.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationDestination.java new file mode 100644 index 00000000..7065310b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationDestination.java @@ -0,0 +1,86 @@ +package com.asyncapi.bindings.solace.v0._2_0.operation; + +import com.asyncapi.bindings.solace.v0._2_0.operation.queue.SolaceOperationQueue; +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * Describes Solace destination. + *

+ * Contains information about the destination in Solace PubSub+ Broker. + * + * @see Solace operation binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonClassDescription("Describes Solace destination.") +public class SolaceOperationDestination { + + /** + * 'queue' or 'topic'. If the type is queue, then the subscriber can bind to the queue, which in turn will + * subscribe to the topic as represented by the channel name or to the provided topicSubscriptions. + */ + @Nullable + @JsonProperty("destinationType") + @JsonPropertyDescription("'queue' or 'topic'. If the type is queue, then the subscriber can bind to the queue, which in turn will subscribe to the topic as represented by the channel name or to the provided topicSubscriptions.") + private Type destinationType; + + /** + * 'direct' or 'persistent'. This determines the quality of service for publishing messages as documented here. + * Default is 'persistent'. + */ + @Nullable + @Builder.Default + @JsonProperty(value = "deliveryMode", defaultValue = "persistent") + @JsonPropertyDescription("'direct' or 'persistent'. This determines the quality of service for publishing messages as documented at https://docs.solace.com/Get-Started/Core-Concepts-Message-Delivery-Modes.htm. Default is 'persistent'.") + private DeliveryMode deliveryMode = DeliveryMode.PERSISTENT; + + /** + * Solace queue destination details. + */ + @Nullable + @JsonProperty("queue") + @JsonPropertyDescription("Solace queue destination details.") + private SolaceOperationQueue queue; + + /** + * The list of topics that the client subscribes to. + */ + @Nullable + @JsonProperty("topicSubscriptions") + @JsonPropertyDescription("The list of topics that the client subscribes to.") + private List topicSubscriptions; + + public enum Type { + + @JsonProperty("queue") + QUEUE, + @JsonProperty("topic") + TOPIC + + } + + public enum DeliveryMode { + + @JsonProperty("direct") + DIRECT, + @JsonProperty("persistent") + PERSISTENT + + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/queue/SolaceOperationQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/queue/SolaceOperationQueue.java new file mode 100644 index 00000000..62bc9db4 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/queue/SolaceOperationQueue.java @@ -0,0 +1,66 @@ +package com.asyncapi.bindings.solace.v0._2_0.operation.queue; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * Describes Solace queue. + *

+ * Contains information about the queue in Solace PubSub+ Broker. + * + * @see Solace operation binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonClassDescription("Describes Solace queue.") +public class SolaceOperationQueue { + + /** + * The name of the queue, only applicable when destinationType is 'queue'. + */ + @Nullable + @JsonProperty("name") + @JsonPropertyDescription("The name of the queue, only applicable when destinationType is 'queue'.") + private String name; + + /** + * A list of topics that the queue subscribes to, only applicable when destinationType is 'queue'. + * If none is given, the queue subscribes to the topic as represented by the channel name. + */ + @Nullable + @JsonProperty("topicSubscriptions") + @JsonPropertyDescription("A list of topics that the queue subscribes to, only applicable when destinationType is 'queue'. If none is given, the queue subscribes to the topic as represented by the channel name.") + private List topicSubscriptions; + + /** + * 'exclusive' or 'nonexclusive'. This is documented here. Only applicable when destinationType is 'queue'. + */ + @Nullable + @JsonProperty("accessType") + @JsonPropertyDescription("'exclusive' or 'nonexclusive'. This is documented at https://docs.solace.com/Messaging/Guaranteed-Msg/Endpoints.htm#Queues. Only applicable when destinationType is 'queue'.") + private AccessType accessType; + + public enum AccessType { + + @JsonProperty("exclusive") + EXCLUSIVE, + @JsonProperty("non-exclusive") + NON_EXCLUSIVE + + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/server/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/server/SolaceServerBinding.java new file mode 100644 index 00000000..61e3440c --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/server/SolaceServerBinding.java @@ -0,0 +1,44 @@ +package com.asyncapi.bindings.solace.v0._2_0.server; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Solace server binding. + * + * @see Solace server binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceServerBinding extends com.asyncapi.bindings.solace.SolaceServerBinding { + + /** + * Message VPN of the Solace Broker + *

+ * e.g. msgVpn: solace-broker-msg-vpn + */ + @Nullable + @JsonProperty("msgVpn") + @JsonPropertyDescription("Message VPN of the Solace Broker") + private String msgVpn; + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java index 5ba426aa..021f75ed 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java @@ -16,7 +16,6 @@ * @author Pavel Bodiachevskii */ @Data -@Builder @NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class SolaceChannelBinding extends com.asyncapi.bindings.solace.SolaceChannelBinding { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java index eb3ed54d..6cbbcd93 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java @@ -16,7 +16,6 @@ * @author Pavel Bodiachevskii */ @Data -@Builder @NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class SolaceMessageBinding extends com.asyncapi.bindings.solace.SolaceMessageBinding { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java index 71bcaa25..a71e7a04 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java @@ -1,7 +1,6 @@ package com.asyncapi.bindings.solace.v0._3_0.operation; import com.asyncapi.bindings.solace.v0._3_0.operation.queue.SolaceOperationQueue; -import com.asyncapi.bindings.solace.v0._3_0.operation.topic.SolaceOperationTopic; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -11,6 +10,8 @@ import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; +import java.util.List; + /** * Describes Solace destination. *

@@ -55,12 +56,12 @@ public class SolaceOperationDestination { private SolaceOperationQueue queue; /** - * Solace topic destination details. + * The list of topics that the client subscribes to. */ @Nullable - @JsonProperty("topic") - @JsonPropertyDescription("Solace topic destination details.") - private SolaceOperationTopic topic; + @JsonProperty("topicSubscriptions") + @JsonPropertyDescription("The list of topics that the client subscribes to.") + private List topicSubscriptions; public enum Type { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java index 2c702c7d..6cfb4b95 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java @@ -74,7 +74,7 @@ public enum AccessType { @JsonProperty("exclusive") EXCLUSIVE, - @JsonProperty("non-exclusive") + @JsonProperty("nonexclusive") NON_EXCLUSIVE } diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/topic/SolaceOperationTopic.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/topic/SolaceOperationTopic.java deleted file mode 100644 index 18a394cf..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/topic/SolaceOperationTopic.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.asyncapi.bindings.solace.v0._3_0.operation.topic; - -import com.fasterxml.jackson.annotation.JsonClassDescription; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -/** - * Describes Solace topic. - *

- * Contains information about the topic in Solace PubSub+ Broker. - * - * @version 0.3.0 - * @see Solace operation binding - * @author Dennis Brinley, Pavel Bodiachevskii - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@JsonClassDescription("Describes Solace topic.") -public class SolaceOperationTopic { - - /** - * A list of topics that the client subscribes to, only applicable when destinationType is 'topic'. - * If none is given, the client subscribes to the topic as represented by the channel name. - */ - @Nullable - @JsonProperty("topicSubscriptions") - @JsonPropertyDescription("A list of topics that the client subscribes to, only applicable when destinationType is 'topic'. If none is given, the client subscribes to the topic as represented by the channel name.") - protected List topicSubscriptions; - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/channel/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/channel/SolaceChannelBinding.java new file mode 100644 index 00000000..1669ce9b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/channel/SolaceChannelBinding.java @@ -0,0 +1,35 @@ +package com.asyncapi.bindings.solace.v0._4_0.channel; + +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Solace channel binding. + * + * @see Solace channel binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.4.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceChannelBinding extends com.asyncapi.bindings.solace.SolaceChannelBinding { + + @Override + public String getBindingVersion() { + return "0.4.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.4.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/message/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/message/SolaceMessageBinding.java new file mode 100644 index 00000000..32b1759e --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/message/SolaceMessageBinding.java @@ -0,0 +1,35 @@ +package com.asyncapi.bindings.solace.v0._4_0.message; + +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes Solace message binding. + * + * @see Solace message binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.4.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceMessageBinding extends com.asyncapi.bindings.solace.SolaceMessageBinding { + + @Override + public String getBindingVersion() { + return "0.4.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.4.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationBinding.java new file mode 100644 index 00000000..b4e565b7 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationBinding.java @@ -0,0 +1,71 @@ +package com.asyncapi.bindings.solace.v0._4_0.operation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * Describes Solace operation binding. + *

+ * Contains information about the operation representation in Solace PubSub+ Broker. + * + * @see Solace operation binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.4.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceOperationBinding extends com.asyncapi.bindings.solace.SolaceOperationBinding { + + /** + * List of destinations + */ + @Nullable + @JsonProperty("destinations") + @JsonPropertyDescription("List of destinations") + private List destinations; + + /** + * Interval in milliseconds or a Schema Object containing the definition of the lifetime of the message. + */ + @Nullable + @JsonProperty("timeToLive") + private Integer timeToLive; + + /** + * The valid priority value range is 0-255 with 0 as the lowest priority and 255 as the highest or + * a Schema Object containing the definition of the priority. + */ + @Nullable + @javax.validation.constraints.Min(0) + @javax.validation.constraints.Max(255) + private Integer priority; + + /** + * Set the message to be eligible to be moved to a Dead Message Queue. + *

+ * The default value is false. + */ + @Nullable + @Builder.Default + private Boolean dmqEligible = false; + + @Override + public String getBindingVersion() { + return "0.4.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.4.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationDestination.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationDestination.java new file mode 100644 index 00000000..ef73a2b0 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationDestination.java @@ -0,0 +1,84 @@ +package com.asyncapi.bindings.solace.v0._4_0.operation; + +import com.asyncapi.bindings.solace.v0._4_0.operation.queue.SolaceOperationQueue; +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * Describes Solace destination. + *

+ * Contains information about the destination in Solace PubSub+ Broker. + * + * @version 0.4.0 + * @see Solace operation binding + * @author Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonClassDescription("Describes Solace destination.") +public class SolaceOperationDestination { + + /** + * 'queue' or 'topic'. If the type is queue, then the subscriber can bind to the queue, which in turn will + * subscribe to the topic as represented by the channel name or to the provided topicSubscriptions. + */ + @Nullable + @JsonProperty("destinationType") + @JsonPropertyDescription("'queue' or 'topic'. If the type is queue, then the subscriber can bind to the queue, which in turn will subscribe to the topic as represented by the channel name or to the provided topicSubscriptions.") + private Type destinationType; + + /** + * 'direct' or 'persistent'. This determines the quality of service for publishing messages as documented here. + * Default is 'persistent'. + */ + @Nullable + @Builder.Default + @JsonProperty(value = "deliveryMode", defaultValue = "persistent") + @JsonPropertyDescription("'direct' or 'persistent'. This determines the quality of service for publishing messages as documented at https://docs.solace.com/Get-Started/Core-Concepts-Message-Delivery-Modes.htm. Default is 'persistent'.") + private DeliveryMode deliveryMode = DeliveryMode.PERSISTENT; + + /** + * Solace queue destination details. + */ + @Nullable + @JsonProperty("queue") + @JsonPropertyDescription("Solace queue destination details.") + private SolaceOperationQueue queue; + + /** + * The list of topics that the client subscribes to. + */ + @Nullable + @JsonProperty("topicSubscriptions") + @JsonPropertyDescription("The list of topics that the client subscribes to.") + private List topicSubscriptions; + + public enum Type { + + @JsonProperty("queue") + QUEUE, + @JsonProperty("topic") + TOPIC + + } + + public enum DeliveryMode { + + @JsonProperty("direct") + DIRECT, + @JsonProperty("persistent") + PERSISTENT + + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/queue/SolaceOperationQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/queue/SolaceOperationQueue.java new file mode 100644 index 00000000..c0f622e0 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/queue/SolaceOperationQueue.java @@ -0,0 +1,82 @@ +package com.asyncapi.bindings.solace.v0._4_0.operation.queue; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * Describes Solace queue. + *

+ * Contains information about the queue in Solace PubSub+ Broker. + * + * @version 0.4.0 + * @see Solace operation binding + * @author Dennis Brinley, Pavel Bodiachevskii + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonClassDescription("Describes Solace queue.") +public class SolaceOperationQueue { + + /** + * The name of the queue, only applicable when destinationType is 'queue'. + */ + @Nullable + @JsonProperty("name") + @JsonPropertyDescription("The name of the queue, only applicable when destinationType is 'queue'.") + private String name; + + /** + * A list of topics that the queue subscribes to, only applicable when destinationType is 'queue'. + * If none is given, the queue subscribes to the topic as represented by the channel name. + */ + @Nullable + @JsonProperty("topicSubscriptions") + @JsonPropertyDescription("A list of topics that the queue subscribes to, only applicable when destinationType is 'queue'. If none is given, the queue subscribes to the topic as represented by the channel name.") + private List topicSubscriptions; + + /** + * 'exclusive' or 'nonexclusive'. This is documented here. Only applicable when destinationType is 'queue'. + */ + @Nullable + @JsonProperty("accessType") + @JsonPropertyDescription("'exclusive' or 'nonexclusive'. This is documented at https://docs.solace.com/Messaging/Guaranteed-Msg/Endpoints.htm#Queues. Only applicable when destinationType is 'queue'.") + private AccessType accessType; + + /** + * The maximum amount of message spool that the given queue may use. This is documented here. + * Only applicable when destinationType is 'queue'. + */ + @Nullable + @JsonProperty("maxMsgSpoolSize") + @JsonPropertyDescription("The maximum amount of message spool that the given queue may use. This is documented at https://docs.solace.com/Messaging/Guaranteed-Msg/Message-Spooling.htm#max-spool-usage. Only applicable when destinationType is 'queue'.") + private String maxMsgSpoolSize; + + /** + * The maximum TTL to apply to messages to be spooled. This is documented here. + * Only applicable when destinationType is 'queue'. + */ + @Nullable + @JsonProperty("maxTtl") + @JsonPropertyDescription("The maximum TTL to apply to messages to be spooled. This is documented at https://docs.solace.com/Messaging/Guaranteed-Msg/Configuring-Queues.htm. Only applicable when destinationType is 'queue'.") + private String maxTtl; + + public enum AccessType { + + @JsonProperty("exclusive") + EXCLUSIVE, + @JsonProperty("nonexclusive") + NON_EXCLUSIVE + + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/server/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/server/SolaceServerBinding.java new file mode 100644 index 00000000..036cf5dc --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/server/SolaceServerBinding.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.solace.v0._4_0.server; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Solace server binding. + * + * @see Solace server binding + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.4.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SolaceServerBinding extends com.asyncapi.bindings.solace.SolaceServerBinding { + + /** + * Message VPN of the Solace Broker + *

+ * e.g. msgVpn: solace-broker-msg-vpn + */ + @Nullable + @JsonProperty("msgVpn") + @JsonPropertyDescription("Message VPN of the Solace Broker") + private String msgVpn; + + /** + * A unique client name to use to register to the appliance. + *

+ * If specified, it must be a valid Topic name, and a maximum of 160 bytes in length when encoded as UTF-8. + */ + @Nullable + @JsonProperty("clientName") + @javax.validation.constraints.Size(min = 1, max = 160) + private String clientName; + + @Override + public String getBindingVersion() { + return "0.4.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.4.0"); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceLatestTest.java index aece2c82..236182ab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceLatestTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceLatestTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.solace; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; -import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; +import com.asyncapi.bindings.solace.v0._4_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._4_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._4_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._4_0.server.SolaceServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,7 +14,7 @@ public class SolaceLatestTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = SolaceV0_3_0Test.channelBinding(); + super.binding = SolaceV0_4_0Test.channelBinding(); super.bindingTypeClass = SolaceChannelBinding.class; super.pathToBindingJson = "/bindings/solace/latest/channel/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/latest/channel/binding - extended.json"; @@ -24,7 +24,7 @@ class ChannelTest extends BindingTest {{ @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = SolaceV0_3_0Test.messageBinding(); + super.binding = SolaceV0_4_0Test.messageBinding(); super.bindingTypeClass = SolaceMessageBinding.class; super.pathToBindingJson = "/bindings/solace/latest/message/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/latest/message/binding - extended.json"; @@ -34,7 +34,7 @@ class Message extends BindingTest {{ @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = SolaceV0_3_0Test.operationBinding(); + super.binding = SolaceV0_4_0Test.operationBinding(); super.bindingTypeClass = SolaceOperationBinding.class; super.pathToBindingJson = "/bindings/solace/latest/operation/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/latest/operation/binding - extended.json"; @@ -44,7 +44,7 @@ class Operation extends BindingTest {{ @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = SolaceV0_3_0Test.serverBinding(); + super.binding = SolaceV0_4_0Test.serverBinding(); super.bindingTypeClass = SolaceServerBinding.class; super.pathToBindingJson = "/bindings/solace/latest/server/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/latest/server/binding - extended.json"; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceUnknownVersionTest.java index 5e6fc20f..5ab2a6af 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceUnknownVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceUnknownVersionTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.solace; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; -import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; +import com.asyncapi.bindings.solace.v0._4_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._4_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._4_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._4_0.server.SolaceServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,7 +14,7 @@ public class SolaceUnknownVersionTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = SolaceV0_3_0Test.channelBinding(); + super.binding = SolaceV0_4_0Test.channelBinding(); super.bindingTypeClass = SolaceChannelBinding.class; super.pathToBindingJson = "/bindings/solace/unknown version/channel/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/unknown version/channel/binding - extended.json"; @@ -24,7 +24,7 @@ class ChannelTest extends BindingTest {{ @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = SolaceV0_3_0Test.messageBinding(); + super.binding = SolaceV0_4_0Test.messageBinding(); super.bindingTypeClass = SolaceMessageBinding.class; super.pathToBindingJson = "/bindings/solace/unknown version/message/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/unknown version/message/binding - extended.json"; @@ -34,7 +34,7 @@ class Message extends BindingTest {{ @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = SolaceV0_3_0Test.operationBinding(); + super.binding = SolaceV0_4_0Test.operationBinding(); super.bindingTypeClass = SolaceOperationBinding.class; super.pathToBindingJson = "/bindings/solace/unknown version/operation/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/unknown version/operation/binding - extended.json"; @@ -44,7 +44,7 @@ class Operation extends BindingTest {{ @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = SolaceV0_3_0Test.serverBinding(); + super.binding = SolaceV0_4_0Test.serverBinding(); super.bindingTypeClass = SolaceServerBinding.class; super.pathToBindingJson = "/bindings/solace/unknown version/server/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/unknown version/server/binding - extended.json"; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_1_0Test.java new file mode 100644 index 00000000..8c64d761 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_1_0Test.java @@ -0,0 +1,70 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.solace.v0._1_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._1_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._1_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._1_0.server.SolaceServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class SolaceV0_1_0Test { + + public static SolaceChannelBinding channelBinding () { + return new SolaceChannelBinding(); + } + + public static SolaceMessageBinding messageBinding () { + return new SolaceMessageBinding(); + } + + public static SolaceOperationBinding operationBinding () { + return new SolaceOperationBinding(); + } + + public static SolaceServerBinding serverBinding () { + return new SolaceServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = SolaceChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = SolaceMessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = SolaceOperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = SolaceServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_2_0Test.java new file mode 100644 index 00000000..e49c4941 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_2_0Test.java @@ -0,0 +1,90 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.solace.v0._2_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._2_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._2_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._2_0.operation.SolaceOperationDestination; +import com.asyncapi.bindings.solace.v0._2_0.operation.queue.SolaceOperationQueue; +import com.asyncapi.bindings.solace.v0._2_0.server.SolaceServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.2.0") +public class SolaceV0_2_0Test { + + public static SolaceChannelBinding channelBinding () { + return new SolaceChannelBinding(); + } + + public static SolaceMessageBinding messageBinding () { + return new SolaceMessageBinding(); + } + + public static SolaceOperationBinding operationBinding () { + return SolaceOperationBinding.builder() + .destinations(List.of( + SolaceOperationDestination.builder() + .destinationType(SolaceOperationDestination.Type.QUEUE) + .queue(SolaceOperationQueue.builder() + .name("CreatedHREvents") + .topicSubscriptions(List.of("person/*/created")) + .accessType(SolaceOperationQueue.AccessType.EXCLUSIVE) + .build() + ) + .build(), + SolaceOperationDestination.builder() + .destinationType(SolaceOperationDestination.Type.TOPIC) + .topicSubscriptions(List.of("person/*/updated")) + .build() + )) + .build(); + } + + public static SolaceServerBinding serverBinding () { + return new SolaceServerBinding("solace.private.net"); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = SolaceChannelBinding.class; + super.pathToBindingJson = "/bindings/solace/0.2.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.2.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.2.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = SolaceMessageBinding.class; + super.pathToBindingJson = "/bindings/solace/0.2.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.2.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.2.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = SolaceOperationBinding.class; + super.pathToBindingJson = "/bindings/solace/0.2.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.2.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.2.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = SolaceServerBinding.class; + super.pathToBindingJson = "/bindings/solace/0.2.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.2.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.2.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_3_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_3_0Test.java index 7c6f695f..903709d8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_3_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_3_0Test.java @@ -6,7 +6,6 @@ import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationDestination; import com.asyncapi.bindings.solace.v0._3_0.operation.queue.SolaceOperationQueue; -import com.asyncapi.bindings.solace.v0._3_0.operation.topic.SolaceOperationTopic; import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -39,16 +38,8 @@ public static SolaceOperationBinding operationBinding () { ) .build(), SolaceOperationDestination.builder() - .destinationType(SolaceOperationDestination.Type.QUEUE) - .queue(SolaceOperationQueue.builder() - .name("UpdatedHREvents") - .topicSubscriptions(List.of("person/*/updated")) - .build() - ) - .topic(SolaceOperationTopic.builder() - .topicSubscriptions(List.of("person/*/updated")) - .build() - ) + .destinationType(SolaceOperationDestination.Type.TOPIC) + .topicSubscriptions(List.of("person/*/updated")) .build() )) .build(); diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_4_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_4_0Test.java new file mode 100644 index 00000000..e8c9845f --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceV0_4_0Test.java @@ -0,0 +1,93 @@ +package com.asyncapi.bindings.solace; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.solace.v0._4_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._4_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._4_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._4_0.operation.SolaceOperationDestination; +import com.asyncapi.bindings.solace.v0._4_0.operation.queue.SolaceOperationQueue; +import com.asyncapi.bindings.solace.v0._4_0.server.SolaceServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.4.0") +public class SolaceV0_4_0Test { + + public static SolaceChannelBinding channelBinding () { + return new SolaceChannelBinding(); + } + + public static SolaceMessageBinding messageBinding () { + return new SolaceMessageBinding(); + } + + public static SolaceOperationBinding operationBinding () { + return SolaceOperationBinding.builder() + .destinations(List.of( + SolaceOperationDestination.builder() + .destinationType(SolaceOperationDestination.Type.QUEUE) + .queue(SolaceOperationQueue.builder() + .name("sampleQueue") + .topicSubscriptions(List.of("samples/*")) + .accessType(SolaceOperationQueue.AccessType.NON_EXCLUSIVE) + .build() + ) + .build(), + SolaceOperationDestination.builder() + .destinationType(SolaceOperationDestination.Type.TOPIC) + .topicSubscriptions(List.of("samples/*")) + .build() + )) + .build(); + } + + public static SolaceServerBinding serverBinding () { + return SolaceServerBinding.builder() + .msgVpn("ProdVPN") + .clientName("transactions-broker") + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = SolaceChannelBinding.class; + super.pathToBindingJson = "/bindings/solace/0.4.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.4.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.4.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = SolaceMessageBinding.class; + super.pathToBindingJson = "/bindings/solace/0.4.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.4.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.4.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = SolaceOperationBinding.class; + super.pathToBindingJson = "/bindings/solace/0.4.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.4.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.4.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = SolaceServerBinding.class; + super.pathToBindingJson = "/bindings/solace/0.4.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/solace/0.4.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/solace/0.4.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceWithoutVersionTest.java index ea793f3a..6217aab1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceWithoutVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/solace/SolaceWithoutVersionTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.solace; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding; -import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding; -import com.asyncapi.bindings.solace.v0._3_0.operation.SolaceOperationBinding; -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding; +import com.asyncapi.bindings.solace.v0._4_0.channel.SolaceChannelBinding; +import com.asyncapi.bindings.solace.v0._4_0.message.SolaceMessageBinding; +import com.asyncapi.bindings.solace.v0._4_0.operation.SolaceOperationBinding; +import com.asyncapi.bindings.solace.v0._4_0.server.SolaceServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,7 +14,7 @@ public class SolaceWithoutVersionTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = SolaceV0_3_0Test.channelBinding(); + super.binding = SolaceV0_4_0Test.channelBinding(); super.bindingTypeClass = SolaceChannelBinding.class; super.pathToBindingJson = "/bindings/solace/without version/channel/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/without version/channel/binding - extended.json"; @@ -24,7 +24,7 @@ class ChannelTest extends BindingTest {{ @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = SolaceV0_3_0Test.messageBinding(); + super.binding = SolaceV0_4_0Test.messageBinding(); super.bindingTypeClass = SolaceMessageBinding.class; super.pathToBindingJson = "/bindings/solace/without version/message/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/without version/message/binding - extended.json"; @@ -34,7 +34,7 @@ class Message extends BindingTest {{ @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = SolaceV0_3_0Test.operationBinding(); + super.binding = SolaceV0_4_0Test.operationBinding(); super.bindingTypeClass = SolaceOperationBinding.class; super.pathToBindingJson = "/bindings/solace/without version/operation/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/without version/operation/binding - extended.json"; @@ -44,7 +44,7 @@ class Operation extends BindingTest {{ @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = SolaceV0_3_0Test.serverBinding(); + super.binding = SolaceV0_4_0Test.serverBinding(); super.bindingTypeClass = SolaceServerBinding.class; super.pathToBindingJson = "/bindings/solace/without version/server/binding.json"; super.pathToExtendedBindingJson = "/bindings/solace/without version/server/binding - extended.json"; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index 85849610..be7be095 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -20,9 +20,8 @@ import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding -import com.asyncapi.bindings.solace.v0._3_0.channel.SolaceChannelBinding +import com.asyncapi.bindings.solace.v0._4_0.channel.SolaceChannelBinding import com.asyncapi.bindings.sqs.SQSV0_2_0Test -import com.asyncapi.bindings.sqs.v0._2_0.channel.SQSChannelBinding import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding import com.asyncapi.bindings.websockets.WebSocketsV0_1_0Test diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 989f60de..2011ce8b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -21,9 +21,8 @@ import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding -import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding +import com.asyncapi.bindings.solace.v0._4_0.message.SolaceMessageBinding import com.asyncapi.bindings.sqs.SQSV0_2_0Test -import com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index ffbcd724..3ef9a8ed 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -19,9 +19,8 @@ import com.asyncapi.bindings.nats.v0._1_0.message.NATSMessageBinding import com.asyncapi.bindings.pulsar.v0._1_0.message.PulsarMessageBinding import com.asyncapi.bindings.redis.v0._1_0.message.RedisMessageBinding import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding -import com.asyncapi.bindings.solace.v0._3_0.message.SolaceMessageBinding +import com.asyncapi.bindings.solace.v0._4_0.message.SolaceMessageBinding import com.asyncapi.bindings.sqs.SQSV0_2_0Test -import com.asyncapi.bindings.sqs.v0._2_0.message.SQSMessageBinding import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 730ab651..1a4a31d7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -21,7 +21,7 @@ import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding -import com.asyncapi.bindings.solace.SolaceV0_3_0Test +import com.asyncapi.bindings.solace.SolaceV0_4_0Test import com.asyncapi.bindings.sqs.SQSV0_2_0Test import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding @@ -116,7 +116,7 @@ class OperationTest { Pair("pulsar", PulsarOperationBinding()), Pair("redis", RedisOperationBinding()), Pair("sns", SNSOperationBinding()), - Pair("solace", SolaceV0_3_0Test.operationBinding()), + Pair("solace", SolaceV0_4_0Test.operationBinding()), Pair("sqs", SQSV0_2_0Test.operationBinding()), Pair("stomp", STOMPOperationBinding()), Pair("ws", WebSocketsOperationBinding()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index ca18aeaf..03fb8e35 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -18,7 +18,7 @@ import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding -import com.asyncapi.bindings.solace.SolaceV0_3_0Test +import com.asyncapi.bindings.solace.SolaceV0_4_0Test import com.asyncapi.bindings.sqs.SQSV0_2_0Test import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding @@ -66,7 +66,7 @@ class OperationTraitTest: SerDeTest() { Pair("pulsar", PulsarOperationBinding()), Pair("redis", RedisOperationBinding()), Pair("sns", SNSOperationBinding()), - Pair("solace", SolaceV0_3_0Test.operationBinding()), + Pair("solace", SolaceV0_4_0Test.operationBinding()), Pair("sqs", SQSV0_2_0Test.operationBinding()), Pair("stomp", STOMPOperationBinding()), Pair("ws", WebSocketsOperationBinding()) diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 914c134c..8a41b8ff 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -17,9 +17,8 @@ import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding +import com.asyncapi.bindings.solace.v0._4_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.SQSV0_2_0Test -import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding @@ -112,11 +111,10 @@ class ServerTest: SerDeTest() { ), Pair("redis", RedisServerBinding()), Pair("sns", SNSServerBinding()), - Pair( - "solace", - SolaceServerBinding.builder() - .msgVpn("solace.private.net") - .build() + Pair("solace", SolaceServerBinding.builder() + .msgVpn("ProdVPN") + .clientName("transactions-broker") + .build() ), Pair("sqs", SQSV0_2_0Test.serverBinding()), Pair("stomp", STOMPServerBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index 6ca6a9a7..e07614d9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test -import com.asyncapi.bindings.solace.SolaceV0_3_0Test +import com.asyncapi.bindings.solace.SolaceV0_4_0Test class OperationWithReferenceToMessageTest: SerDeTest() { @@ -171,7 +171,7 @@ class OperationTest { Pair("sns", Reference("#/components/operationBindings/sns") ), - Pair("solace", SolaceV0_3_0Test.operationBinding()), + Pair("solace", SolaceV0_4_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index 8860b248..f8a85720 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test -import com.asyncapi.bindings.solace.SolaceV0_3_0Test +import com.asyncapi.bindings.solace.SolaceV0_4_0Test class OperationTraitTest: SerDeTest() { @@ -75,7 +75,7 @@ class OperationTraitTest: SerDeTest() { Pair("sns", Reference("#/components/operationBindings/sns") ), - Pair("solace", SolaceV0_3_0Test.operationBinding()), + Pair("solace", SolaceV0_4_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index f5edfa42..a9ac86de 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -18,9 +18,8 @@ import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding +import com.asyncapi.bindings.solace.v0._4_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.SQSV0_2_0Test -import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding @@ -123,11 +122,10 @@ class ServerTest: SerDeTest() { ), Pair("redis", RedisServerBinding()), Pair("sns", SNSServerBinding()), - Pair( - "solace", - SolaceServerBinding.builder() - .msgVpn("solace.private.net") - .build() + Pair("solace", SolaceServerBinding.builder() + .msgVpn("ProdVPN") + .clientName("transactions-broker") + .build() ), Pair("sqs", SQSV0_2_0Test.serverBinding()), Pair("stomp", STOMPServerBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index dbd7842b..3959e630 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test -import com.asyncapi.bindings.solace.SolaceV0_3_0Test +import com.asyncapi.bindings.solace.SolaceV0_4_0Test import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation @@ -98,7 +98,7 @@ class OperationTest: SerDeTest() { Pair("sns", Reference("#/components/operationBindings/sns") ), - Pair("solace", SolaceV0_3_0Test.operationBinding()), + Pair("solace", SolaceV0_4_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs") ), @@ -178,7 +178,7 @@ class OperationTestWithReference: SerDeTest() { Pair("sns", Reference("#/components/operationBindings/sns") ), - Pair("solace", SolaceV0_3_0Test.operationBinding()), + Pair("solace", SolaceV0_4_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 2f9bd763..7572b97a 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -5,7 +5,7 @@ import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test -import com.asyncapi.bindings.solace.SolaceV0_3_0Test +import com.asyncapi.bindings.solace.SolaceV0_4_0Test import com.asyncapi.schemas.asyncapi.Reference import com.asyncapi.v3.SerDeTest import com.asyncapi.v3._0_0.model.ExternalDocumentation @@ -78,7 +78,7 @@ class OperationTraitTest: SerDeTest() { Pair("sns", Reference("#/components/operationBindings/sns") ), - Pair("solace", SolaceV0_3_0Test.operationBinding()), + Pair("solace", SolaceV0_4_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs") ), @@ -156,7 +156,7 @@ class OperationTraitTestWithReference: SerDeTest() { Pair("sns", Reference("#/components/operationBindings/sns") ), - Pair("solace", SolaceV0_3_0Test.operationBinding()), + Pair("solace", SolaceV0_4_0Test.operationBinding()), Pair("sqs", Reference("#/components/operationBindings/sqs") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index aa72f2e2..17b95ccd 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -19,9 +19,8 @@ import com.asyncapi.bindings.nats.v0._1_0.server.NATSServerBinding import com.asyncapi.bindings.pulsar.v0._1_0.server.PulsarServerBinding import com.asyncapi.bindings.redis.v0._1_0.server.RedisServerBinding import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding -import com.asyncapi.bindings.solace.v0._3_0.server.SolaceServerBinding +import com.asyncapi.bindings.solace.v0._4_0.server.SolaceServerBinding import com.asyncapi.bindings.sqs.SQSV0_2_0Test -import com.asyncapi.bindings.sqs.v0._2_0.server.SQSServerBinding import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding import com.asyncapi.schemas.security.v3.ApiKeySecuritySchemeTest @@ -133,11 +132,10 @@ class ServerTest: SerDeTest() { ), Pair("redis", RedisServerBinding()), Pair("sns", SNSServerBinding()), - Pair( - "solace", - SolaceServerBinding.builder() - .msgVpn("solace.private.net") - .build() + Pair("solace", SolaceServerBinding.builder() + .msgVpn("ProdVPN") + .clientName("transactions-broker") + .build() ), Pair("sqs", SQSV0_2_0Test.serverBinding()), Pair("stomp", STOMPServerBinding()), @@ -252,11 +250,10 @@ class ServerTestWithReference: SerDeTest() { ), Pair("redis", RedisServerBinding()), Pair("sns", SNSServerBinding()), - Pair( - "solace", - SolaceServerBinding.builder() - .msgVpn("solace.private.net") - .build() + Pair("solace", SolaceServerBinding.builder() + .msgVpn("ProdVPN") + .clientName("transactions-broker") + .build() ), Pair("sqs", SQSV0_2_0Test.serverBinding()), Pair("stomp", STOMPServerBinding()), diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding - extended.json new file mode 100644 index 00000000..f8651d51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding - extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion" : "0.2.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "CreatedHREvents", + "topicSubscriptions" : [ "person/*/created" ], + "accessType" : "exclusive" + } + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "person/*/updated" ] + } ], + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..9b6caaa7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding - wrongly extended.json @@ -0,0 +1,27 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "CreatedHREvents", + "topicSubscriptions": [ + "person/*/created" + ], + "accessType": "exclusive" + } + }, + { + "destinationType": "topic", + "topicSubscriptions": [ + "person/*/updated" + ] + } + ], + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding.json new file mode 100644 index 00000000..5ba5b132 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/operation/binding.json @@ -0,0 +1,21 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "CreatedHREvents", + "topicSubscriptions": [ + "person/*/created" + ], + "accessType": "exclusive" + } + }, + { + "destinationType": "topic", + "topicSubscriptions": [ + "person/*/updated" + ] + } + ], + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding - extended.json new file mode 100644 index 00000000..551d757c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding - extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion" : "0.2.0", + "msgVpn" : "solace.private.net", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..98e0cf99 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding - wrongly extended.json @@ -0,0 +1,10 @@ +{ + "msgVpn": "solace.private.net", + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding.json new file mode 100644 index 00000000..d16c0ee2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.2.0/server/binding.json @@ -0,0 +1,4 @@ +{ + "msgVpn": "solace.private.net", + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - extended.json index 4b0c664e..35b674a1 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - extended.json @@ -11,15 +11,9 @@ "maxTtl" : "60" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "person/*/updated" ] } ], "x-number" : 0, "x-string" : "", diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - wrongly extended.json index ef371f24..9e57f054 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding - wrongly extended.json @@ -13,18 +13,10 @@ } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "person/*/updated" + ] } ], "bindingVersion": "0.3.0", diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding.json index e5b10158..7756f402 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/solace/0.3.0/operation/binding.json @@ -13,18 +13,10 @@ } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "person/*/updated" + ] } ], "bindingVersion": "0.3.0" diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding - extended.json new file mode 100644 index 00000000..675f2499 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.4.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..70ed3b2e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.4.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding.json new file mode 100644 index 00000000..7f1a56d7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.4.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding - extended.json new file mode 100644 index 00000000..675f2499 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.4.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..70ed3b2e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.4.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding.json new file mode 100644 index 00000000..7f1a56d7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.4.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding - extended.json new file mode 100644 index 00000000..2aa995b3 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding - extended.json @@ -0,0 +1,22 @@ +{ + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" + } + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ], + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..7e8c27ef --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding - wrongly extended.json @@ -0,0 +1,27 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "sampleQueue", + "topicSubscriptions": [ + "samples/*" + ], + "accessType": "nonexclusive" + } + }, + { + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] + } + ], + "bindingVersion": "0.4.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding.json new file mode 100644 index 00000000..f669dd57 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/operation/binding.json @@ -0,0 +1,21 @@ +{ + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "sampleQueue", + "topicSubscriptions": [ + "samples/*" + ], + "accessType": "nonexclusive" + } + }, + { + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] + } + ], + "bindingVersion": "0.4.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding - extended.json new file mode 100644 index 00000000..76ef20ee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..60a0500c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding.json new file mode 100644 index 00000000..40117440 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/solace/0.4.0/server/binding.json @@ -0,0 +1,5 @@ +{ + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - extended.json index 8310c9d6..675f2499 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/channel/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.3.0", + "bindingVersion" : "0.4.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - extended.json index 8310c9d6..675f2499 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/message/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.3.0", + "bindingVersion" : "0.4.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - extended.json index 4b0c664e..2aa995b3 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - extended.json @@ -1,25 +1,18 @@ { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ], "x-number" : 0, "x-string" : "", diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - wrongly extended.json index e431c6be..172713b7 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding - wrongly extended.json @@ -3,28 +3,18 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], "bindingVersion" : "latest", diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding.json index c142538f..7e108d78 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/operation/binding.json @@ -3,28 +3,18 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], "bindingVersion" : "latest" diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - extended.json index c545b3af..76ef20ee 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - extended.json @@ -1,6 +1,7 @@ { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net", + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - wrongly extended.json index 938397bb..60a0500c 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding - wrongly extended.json @@ -1,6 +1,7 @@ { - "msgVpn": "solace.private.net", - "bindingVersion" : "latest", + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding.json index 95e981d0..6baba947 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/solace/latest/server/binding.json @@ -1,4 +1,5 @@ { - "msgVpn": "solace.private.net", + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", "bindingVersion" : "latest" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - extended.json index 8310c9d6..675f2499 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/channel/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.3.0", + "bindingVersion" : "0.4.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - extended.json index 8310c9d6..675f2499 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/message/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.3.0", + "bindingVersion" : "0.4.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - extended.json index 4b0c664e..2aa995b3 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - extended.json @@ -1,25 +1,18 @@ { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ], "x-number" : 0, "x-string" : "", diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - wrongly extended.json index 6a50037f..e40ffdd3 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding - wrongly extended.json @@ -3,28 +3,18 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], "bindingVersion" : "unknown version", diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding.json index 1cad5fe1..4efaecc5 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/operation/binding.json @@ -3,28 +3,18 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], "bindingVersion" : "unknown version" diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - extended.json index c545b3af..76ef20ee 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - extended.json @@ -1,6 +1,7 @@ { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net", + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - wrongly extended.json index ecb3a7c9..0130aa77 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding - wrongly extended.json @@ -1,6 +1,6 @@ { - "msgVpn": "solace.private.net", - "bindingVersion" : "unknown version", + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding.json index 563d1846..0e074946 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/solace/unknown version/server/binding.json @@ -1,4 +1,5 @@ { - "msgVpn": "solace.private.net", + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", "bindingVersion" : "unknown version" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - extended.json index 8310c9d6..675f2499 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.3.0", + "bindingVersion" : "0.4.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - wrongly extended.json index 51fc7912..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion" : "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding.json index f13343f5..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/channel/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion" : "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - extended.json index 8310c9d6..675f2499 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.3.0", + "bindingVersion" : "0.4.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - wrongly extended.json index 51fc7912..a16bbdf8 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding - wrongly extended.json @@ -1,5 +1,4 @@ { - "bindingVersion" : "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding.json index f13343f5..9e26dfee 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/message/binding.json @@ -1,3 +1 @@ -{ - "bindingVersion" : "without version" -} \ No newline at end of file +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - extended.json index 4b0c664e..2aa995b3 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - extended.json @@ -1,25 +1,18 @@ { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ], "x-number" : 0, "x-string" : "", diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - wrongly extended.json index 24370dd6..1d85adc9 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding - wrongly extended.json @@ -3,31 +3,20 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion" : "without version", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding.json index 296c561c..22f6f0cb 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/operation/binding.json @@ -3,29 +3,18 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } - ], - "bindingVersion" : "without version" + ] } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - extended.json index c545b3af..76ef20ee 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - extended.json @@ -1,6 +1,7 @@ { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net", + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - wrongly extended.json index 26cc943d..0130aa77 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding - wrongly extended.json @@ -1,6 +1,6 @@ { - "msgVpn": "solace.private.net", - "bindingVersion" : "without version", + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding.json index 24e582ab..50f224a1 100644 --- a/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/solace/without version/server/binding.json @@ -1,4 +1,4 @@ { - "msgVpn": "solace.private.net", - "bindingVersion" : "without version" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 9606aaef..22dc0213 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -99,8 +99,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -214,27 +215,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -378,27 +372,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -545,27 +532,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -709,27 +689,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -904,7 +877,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -1050,7 +1023,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "queue" : { @@ -1280,7 +1253,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -1522,27 +1495,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -1708,7 +1674,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -1799,8 +1765,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -1918,7 +1885,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "queue" : { @@ -2067,27 +2034,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -2215,7 +2175,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json index 62481d7d..49b7bc87 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json @@ -85,8 +85,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, @@ -176,32 +177,25 @@ "redis" : { }, "sns" : { }, "solace" : { - "destinations" : [ { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null - }, { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "sampleQueue", + "topicSubscriptions": [ + "samples/*" + ], + "accessType": "nonexclusive" + } }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] + { + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } - } ], - "bindingVersion" : "0.3.0" + ], + "bindingVersion": "0.4.0" }, "sqs" : { "queues" : [ { @@ -338,31 +332,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "queues" : [ { @@ -487,32 +471,25 @@ "redis" : { }, "sns" : { }, "solace" : { - "destinations" : [ { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null - }, { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "sampleQueue", + "topicSubscriptions": [ + "samples/*" + ], + "accessType": "nonexclusive" + } }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] + { + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } - } ], - "bindingVersion" : "0.3.0" + ], + "bindingVersion": "0.4.0" }, "sqs" : { "queues" : [ { @@ -649,31 +626,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "queues" : [ { @@ -1413,31 +1380,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "queues" : [ { @@ -1650,8 +1607,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, @@ -1887,32 +1845,25 @@ "redis" : { }, "sns" : { }, "solace" : { - "destinations" : [ { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null - }, { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "sampleQueue", + "topicSubscriptions": [ + "samples/*" + ], + "accessType": "nonexclusive" + } + }, + { + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } - } ], - "bindingVersion" : "0.3.0" + ], + "bindingVersion": "0.4.0" }, "sqs" : { "queues": [ diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 6ced5ac9..86f15bea 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -97,27 +97,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -261,27 +254,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -428,27 +414,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -592,27 +571,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -787,7 +759,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -933,7 +905,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "queue" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json index ef7da0d7..7d417435 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json @@ -79,32 +79,21 @@ "redis" : { }, "sns" : { }, "solace" : { + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" + } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } - } ], - "bindingVersion" : "0.3.0" + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs" : { }, "stomp" : { }, @@ -203,35 +192,21 @@ "redis": {}, "sns": {}, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": {}, "stomp": {}, @@ -322,32 +297,21 @@ "redis" : { }, "sns" : { }, "solace" : { + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" + } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } - } ], - "bindingVersion" : "0.3.0" + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs" : { }, "stomp" : { }, @@ -446,35 +410,21 @@ "redis": { }, "sns": { }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { }, "stomp": { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json index 2ceccefc..54fcbe42 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json @@ -79,32 +79,21 @@ "redis" : { }, "sns" : { }, "solace" : { + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" + } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } - } ], - "bindingVersion" : "0.3.0" + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs" : { "queues": [ @@ -236,35 +225,21 @@ "redis": {}, "sns": {}, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "queues": [ @@ -388,32 +363,21 @@ "redis" : { }, "sns" : { }, "solace" : { + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" + } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } - } ], - "bindingVersion" : "0.3.0" + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs" : { "queues": [ @@ -545,35 +509,21 @@ "redis": { }, "sns": { }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "queues": [ diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index 414c5865..b04351d8 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -127,7 +127,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 4bb389e4..3216b81d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -116,7 +116,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index aec07294..2bf32355 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -95,27 +95,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -259,27 +252,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -454,7 +440,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json index d83eca89..7d3bd21d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json @@ -77,32 +77,21 @@ "redis" : { }, "sns" : { }, "solace" : { + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" + } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } - } ], - "bindingVersion" : "0.3.0" + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs" : { }, "stomp" : { }, @@ -201,35 +190,21 @@ "redis": {}, "sns": {}, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": {}, "stomp": {}, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json index d141b5dc..bcfa7702 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json @@ -77,32 +77,21 @@ "redis" : { }, "sns" : { }, "solace" : { + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" + } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } - } ], - "bindingVersion" : "0.3.0" + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs" : { "queues": [ @@ -234,35 +223,21 @@ "redis": { }, "sns": { }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "queues": [ diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index 2b10a400..d30669bf 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -95,27 +95,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -259,27 +252,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json index 90a25b9b..7cfed3c9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json @@ -77,32 +77,21 @@ "redis" : { }, "sns" : { }, "solace" : { + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" + } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } - } ], - "bindingVersion" : "0.3.0" + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs" : { }, "stomp" : { }, @@ -201,35 +190,21 @@ "redis": {}, "sns": {}, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": {}, "stomp": {}, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json index a8bda938..8161286f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json @@ -77,32 +77,21 @@ "redis" : { }, "sns" : { }, "solace" : { + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" + } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } - } ], - "bindingVersion" : "0.3.0" + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs" : { "queues": [ @@ -234,35 +223,21 @@ "redis": {}, "sns": {}, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "queues": [ diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index eac3ca85..8d071a33 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -95,27 +95,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json index eb460f2a..5bb0b6a9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json @@ -87,35 +87,21 @@ "redis": {}, "sns": {}, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": {}, "stomp": {}, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json index b33074c5..b00a74a0 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json @@ -87,35 +87,21 @@ "redis": {}, "sns": {}, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "queues": [ diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index 5473edbe..cf62e09a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -158,7 +158,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -400,27 +400,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -586,7 +579,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -677,8 +670,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -796,7 +790,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "queue" : { @@ -945,27 +939,20 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -1093,7 +1080,7 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0" + "bindingVersion" : "0.4.0" }, "sqs" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json index e68e8221..77d9a079 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json @@ -376,31 +376,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "queues": [ @@ -612,8 +602,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, @@ -848,32 +839,25 @@ "redis" : { }, "sns" : { }, "solace" : { - "destinations" : [ { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" - }, - "topic" : null - }, { - "destinationType" : "queue", - "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ], - "accessType" : null, - "maxMsgSpoolSize" : null, - "maxTtl" : null + "destinations": [ + { + "destinationType": "queue", + "queue": { + "name": "sampleQueue", + "topicSubscriptions": [ + "samples/*" + ], + "accessType": "nonexclusive" + } }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] + { + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } - } ], - "bindingVersion" : "0.3.0" + ], + "bindingVersion": "0.4.0" }, "sqs" : { "queues": [ diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index ecad218f..7c7296cb 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -79,8 +79,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server.json index a4695f41..15d22480 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server.json @@ -65,8 +65,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index f068e5ff..5b990e4c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -108,8 +108,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -231,27 +232,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -366,27 +360,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -667,27 +654,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -802,27 +782,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -1269,8 +1242,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -1402,27 +1376,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -1537,27 +1504,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -1838,27 +1798,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -1973,27 +1926,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -2706,27 +2652,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -2963,8 +2902,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -3194,27 +3134,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json index 0d0bc009..20a3f477 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json @@ -97,8 +97,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, @@ -235,31 +236,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -395,31 +386,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -727,31 +708,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -887,31 +858,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -1367,8 +1328,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, @@ -1522,31 +1484,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -1682,31 +1634,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -2014,31 +1956,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -2174,31 +2106,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -2956,31 +2878,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -3201,8 +3113,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, @@ -3457,31 +3370,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json index bee38a5d..d8b20fb6 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json @@ -101,27 +101,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -236,27 +229,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -537,27 +523,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -672,27 +651,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json index 574f671e..cce8158c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json @@ -119,35 +119,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -279,35 +265,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -611,35 +583,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -771,35 +729,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json index af23645e..7dd50eb9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json @@ -119,35 +119,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -279,35 +265,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -611,35 +583,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -771,35 +729,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json index e546d5e6..a45ae46c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json @@ -98,27 +98,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -233,27 +226,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json index 8e5c60c8..0d5465ed 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json @@ -115,35 +115,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -276,35 +262,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json index 73a28287..f701d24d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json @@ -114,35 +114,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -274,35 +260,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json index 54c8e851..3b0bfe5c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json @@ -98,27 +98,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -233,27 +226,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json index af6bd128..72b66f9c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json @@ -114,35 +114,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -274,35 +260,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json index 11d2f965..5fb48f56 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json @@ -114,35 +114,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -274,35 +260,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json index 9a450a2a..72b07192 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json @@ -98,27 +98,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -233,27 +226,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json index 7b9dc4c2..3d286bc6 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json @@ -114,35 +114,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -274,35 +260,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json index 8094e789..7cd5dd0e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json @@ -114,35 +114,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -274,35 +260,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json index 03e8e89f..42c09818 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json @@ -98,27 +98,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json index 9e94323b..d150df91 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json @@ -114,35 +114,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json index 42d31af2..1120bc65 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json @@ -114,35 +114,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index d2cdf70e..4b5ca7ec 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -120,8 +120,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -253,27 +254,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -388,27 +382,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -689,27 +676,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -824,27 +804,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -1557,27 +1530,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -1814,8 +1780,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -2045,27 +2012,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json index 38d4b02d..a3bc9cbd 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json @@ -108,8 +108,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs": {}, "stomp": {}, @@ -260,35 +261,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -421,35 +408,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -753,35 +726,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -914,35 +873,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -1695,35 +1640,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -1943,8 +1874,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs": {}, "stomp": {}, @@ -2196,35 +2128,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json index ab41a4dc..e8cf4cab 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json @@ -108,8 +108,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs": {}, "stomp": {}, @@ -259,35 +260,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -419,35 +406,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -751,35 +724,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -911,35 +870,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -1693,35 +1638,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -1942,8 +1873,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs": {}, "stomp": {}, @@ -2194,35 +2126,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index 6fc3f3c3..bf8b501e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -89,8 +89,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server.json index c924cdbc..3ccb20e2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server.json @@ -77,8 +77,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 66186e96..5009498a 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -135,8 +135,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -257,8 +258,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -4248,27 +4250,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4387,27 +4382,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4525,27 +4513,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4694,27 +4675,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4833,27 +4807,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4971,27 +4938,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -5161,8 +5121,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -9163,27 +9124,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -9302,27 +9256,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -9440,27 +9387,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -9609,27 +9549,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -9748,27 +9681,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -9886,27 +9812,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -11951,27 +11870,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -12090,27 +12002,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -12630,8 +12535,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -12861,27 +12767,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json index 8e189633..050a9b53 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json @@ -123,8 +123,9 @@ "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs" : { }, "stomp" : { }, @@ -225,8 +226,9 @@ "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs" : { }, "stomp" : { }, @@ -4382,31 +4384,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -4545,31 +4537,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -4707,31 +4689,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -4907,31 +4879,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -5070,31 +5032,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -5232,31 +5184,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -5417,8 +5359,9 @@ "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs" : { }, "stomp" : { }, @@ -9591,31 +9534,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -9754,31 +9687,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -9916,31 +9839,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -10116,31 +10029,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -10279,31 +10182,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -10441,31 +10334,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -12608,31 +12491,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -12770,31 +12643,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -13304,8 +13167,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, @@ -13560,31 +13424,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index 36e396b3..0ddd7166 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -137,8 +137,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -4139,27 +4140,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4278,27 +4272,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4416,27 +4403,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4585,27 +4565,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4724,27 +4697,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -4862,27 +4828,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -6927,27 +6886,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -7066,27 +7018,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -7606,8 +7551,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" @@ -7837,27 +7783,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json index 55da0795..20d6964f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json @@ -123,8 +123,9 @@ "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs" : { }, "stomp" : { }, @@ -4297,31 +4298,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -4460,31 +4451,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -4622,31 +4603,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -4822,31 +4793,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -4985,31 +4946,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -5147,31 +5098,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -7314,31 +7255,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -7476,31 +7407,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -8010,8 +7931,9 @@ "redis": {}, "sns": {}, "solace": { - "msgVpn": "solace.private.net", - "bindingVersion": "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs": {}, "stomp": {}, @@ -8266,31 +8188,21 @@ { "destinationType": "queue", "queue": { - "name": "CreatedHREvents", + "name": "sampleQueue", "topicSubscriptions": [ - "person/*/created" + "samples/*" ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" + "accessType": "nonexclusive" } }, { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "destinationType": "topic", + "topicSubscriptions": [ + "samples/*" + ] } ], - "bindingVersion": "0.3.0" + "bindingVersion": "0.4.0" }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json index 6f57baf6..43c83656 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json @@ -108,27 +108,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -247,27 +240,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -385,27 +371,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json index ad4e3d96..1f42bdcf 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json @@ -122,35 +122,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -285,35 +271,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -447,35 +419,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json index c39fcd32..cfd2161f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json @@ -107,27 +107,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -246,27 +239,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { @@ -384,27 +370,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json index d3a8274c..0728c723 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json @@ -121,35 +121,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json index 9ce9700c..59de4dba 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json @@ -121,35 +121,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -284,35 +270,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -446,35 +418,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json index 1820ec38..36d0173f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json @@ -122,35 +122,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -285,35 +271,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" @@ -447,35 +419,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json index a74c582e..8d1c60dd 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json @@ -104,27 +104,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json index cceee224..ee5beb12 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json @@ -120,35 +120,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json index ad3d432c..c9f51eb2 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json @@ -103,27 +103,20 @@ "$ref" : "#/components/operationBindings/sns" }, "solace" : { - "bindingVersion" : "0.3.0", + "dmqEligible" : false, + "bindingVersion" : "0.4.0", "destinations" : [ { "destinationType" : "queue", "deliveryMode" : "persistent", "queue" : { - "name" : "CreatedHREvents", - "topicSubscriptions" : [ "person/*/created" ], - "accessType" : "exclusive", - "maxMsgSpoolSize" : "1,500", - "maxTtl" : "60" + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } }, { - "destinationType" : "queue", + "destinationType" : "topic", "deliveryMode" : "persistent", - "queue" : { - "name" : "UpdatedHREvents", - "topicSubscriptions" : [ "person/*/updated" ] - }, - "topic" : { - "topicSubscriptions" : [ "person/*/updated" ] - } + "topicSubscriptions" : [ "samples/*" ] } ] }, "sqs" : { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json index 1609576f..380a10a5 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json @@ -119,35 +119,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json index fc121ef8..6411d662 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json @@ -119,35 +119,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json index 59bdfa8d..e3a29fa9 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json @@ -120,35 +120,21 @@ "$ref": "#/components/operationBindings/sns" }, "solace": { - "destinations": [ - { - "destinationType": "queue", - "queue": { - "name": "CreatedHREvents", - "topicSubscriptions": [ - "person/*/created" - ], - "accessType": "exclusive", - "maxMsgSpoolSize": "1,500", - "maxTtl": "60" - } - }, - { - "destinationType": "queue", - "queue": { - "name": "UpdatedHREvents", - "topicSubscriptions": [ - "person/*/updated" - ] - }, - "topic": { - "topicSubscriptions": [ - "person/*/updated" - ] - } + "dmqEligible" : false, + "bindingVersion" : "0.4.0", + "destinations" : [ { + "destinationType" : "queue", + "deliveryMode" : "persistent", + "queue" : { + "name" : "sampleQueue", + "topicSubscriptions" : [ "samples/*" ], + "accessType" : "nonexclusive" } - ], - "bindingVersion": "0.3.0" + }, { + "destinationType" : "topic", + "deliveryMode" : "persistent", + "topicSubscriptions" : [ "samples/*" ] + } ] }, "sqs": { "$ref": "#/components/operationBindings/sqs" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index c709bd24..75e237a0 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -103,8 +103,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 9b419c86..15361c71 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -106,8 +106,9 @@ "bindingVersion" : "0.1.0" }, "solace" : { - "bindingVersion" : "0.3.0", - "msgVpn" : "solace.private.net" + "bindingVersion" : "0.4.0", + "msgVpn" : "ProdVPN", + "clientName" : "transactions-broker" }, "sqs" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference.json index 3dffe38d..95b250d1 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference.json @@ -92,8 +92,9 @@ "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs" : { }, "stomp" : { }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server.json index 387253d0..f423959e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server.json @@ -89,8 +89,9 @@ "redis" : { }, "sns" : { }, "solace" : { - "msgVpn" : "solace.private.net", - "bindingVersion" : "0.3.0" + "clientName": "transactions-broker", + "msgVpn": "ProdVPN", + "bindingVersion": "0.4.0" }, "sqs" : { }, "stomp" : { }, From 727ae27b283d59301d9b27cf1c8e571118acafc1 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sat, 11 May 2024 18:16:03 +0400 Subject: [PATCH 100/141] feat(models): remove final from AsyncAPI.asyncapi field --- .../src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java | 2 +- .../src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java | 2 +- .../src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java index 183bea05..c2baf499 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/model/AsyncAPI.java @@ -46,7 +46,7 @@ public class AsyncAPI extends ExtendableObject { */ @NotNull @Builder.Default - private final String asyncapi = "2.0.0"; + private String asyncapi = "2.0.0"; /** * Identifier of the application the AsyncAPI document is defining. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java index 655b3fbb..3fbe507a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/AsyncAPI.java @@ -49,7 +49,7 @@ public class AsyncAPI extends ExtendableObject { */ @NotNull @Builder.Default - private final String asyncapi = "2.6.0"; + private String asyncapi = "2.6.0"; /** * Identifier of the application the AsyncAPI document is defining. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java index 919049df..59c3dde4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/AsyncAPI.java @@ -47,7 +47,7 @@ public class AsyncAPI extends ExtendableObject { */ @NotNull @Builder.Default - private final String asyncapi = "3.0.0"; + private String asyncapi = "3.0.0"; /** * Identifier of the application the AsyncAPI document is defining. From 9b9d4f520cf72407b2cdd5e95c3d49c17855a94f Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Sun, 12 May 2024 16:01:10 +0400 Subject: [PATCH 101/141] feat(bindings): SNS 0.1.0 --- .../v0/_1_0/channel/SNSChannelBinding.java | 42 +++++- .../v0/_1_0/channel/SNSChannelOrdering.java | 37 +++++ .../_1_0/channel/SNSChannelOrderingType.java | 22 +++ .../sns/v0/_1_0/channel/SNSChannelPolicy.java | 33 +++++ .../channel/SNSChannelPolicyStatement.java | 44 ++++++ .../SNSChannelPolicyStatementEffect.java | 13 ++ .../v0/_1_0/message/SNSMessageBinding.java | 4 +- .../_1_0/operation/SNSOperationBinding.java | 38 ++++- .../_1_0/operation/SNSOperationConsumer.java | 87 +++++++++++ .../SNSOperationConsumerDeliveryPolicy.java | 72 +++++++++ ...ConsumerDeliveryPolicyBackoffFunction.java | 19 +++ ...SNSOperationConsumerFilterPolicyScope.java | 13 ++ .../SNSOperationConsumerProtocol.java | 34 +++++ .../SNSOperationConsumerRedrivePolicy.java | 40 +++++ .../SNSOperationDestinationIdentifier.java | 61 ++++++++ .../sns/v0/_1_0/server/SNSServerBinding.java | 4 +- .../asyncapi/bindings/sns/SNSLatestTest.java | 24 +-- .../bindings/sns/SNSUnknownVersionTest.java | 24 +-- .../asyncapi/bindings/sns/SNSV0_1_0Test.java | 88 +++++++++-- .../bindings/sns/SNSWithoutVersionTest.java | 24 +-- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../sns/0.1.0/channel/binding - extended.json | 16 ++ .../channel/binding - wrongly extended.json | 19 +++ .../bindings/sns/0.1.0/channel/binding.json | 13 ++ .../sns/0.1.0/message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 9 ++ .../bindings/sns/0.1.0/message/binding.json | 3 + .../0.1.0/operation/binding - extended.json | 42 ++++++ .../operation/binding - wrongly extended.json | 53 +++++++ .../bindings/sns/0.1.0/operation/binding.json | 47 ++++++ .../sns/0.1.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 ++ .../bindings/sns/0.1.0/server/binding.json | 3 + .../latest/channel/binding - extended.json | 16 ++ .../channel/binding - wrongly extended.json | 19 +++ .../bindings/sns/latest/channel/binding.json | 13 ++ .../latest/message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 9 ++ .../bindings/sns/latest/message/binding.json | 3 + .../latest/operation/binding - extended.json | 42 ++++++ .../operation/binding - wrongly extended.json | 53 +++++++ .../sns/latest/operation/binding.json | 47 ++++++ .../sns/latest/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 ++ .../bindings/sns/latest/server/binding.json | 3 + .../channel/binding - extended.json | 16 ++ .../channel/binding - wrongly extended.json | 19 +++ .../sns/unknown version/channel/binding.json | 13 ++ .../message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 9 ++ .../sns/unknown version/message/binding.json | 3 + .../operation/binding - extended.json | 42 ++++++ .../operation/binding - wrongly extended.json | 53 +++++++ .../unknown version/operation/binding.json | 47 ++++++ .../server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 ++ .../sns/unknown version/server/binding.json | 3 + .../channel/binding - extended.json | 16 ++ .../channel/binding - wrongly extended.json | 18 +++ .../sns/without version/channel/binding.json | 12 ++ .../message/binding - extended.json | 8 + .../message/binding - wrongly extended.json | 8 + .../sns/without version/message/binding.json | 1 + .../operation/binding - extended.json | 42 ++++++ .../operation/binding - wrongly extended.json | 52 +++++++ .../without version/operation/binding.json | 46 ++++++ .../server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 8 + .../sns/without version/server/binding.json | 1 + .../v2/2.0.0/model/asyncapi - extended.json | 121 +++++++++++++++ .../json/v2/2.0.0/model/asyncapi.json | 138 +++++++++++++++++- .../model/channel/channelItem - extended.json | 78 ++++++++++ .../channelItem - wrongly extended.json | 96 +++++++++++- .../v2/2.0.0/model/channel/channelItem.json | 88 ++++++++++- .../operation with message - extended.json | 35 +++++ ...ation with message - wrongly extended.json | 52 ++++++- .../operation/operation with message.json | 48 +++++- ... with reference to message - extended.json | 35 +++++ ...ference to message - wrongly extended.json | 48 +++++- .../operation with reference to message.json | 48 +++++- .../operation/operationTrait - extended.json | 1 + .../components/components - extended.json | 43 ++++++ .../v2/2.0.0/model/components/components.json | 50 ++++++- 84 files changed, 2437 insertions(+), 85 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrdering.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrderingType.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicy.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatementEffect.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumer.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicy.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicyBackoffFunction.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerFilterPolicyScope.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerProtocol.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerRedrivePolicy.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationDestinationIdentifier.java create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/latest/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/sns/without version/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java index 75545d91..a0faa837 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java @@ -1,24 +1,54 @@ package com.asyncapi.bindings.sns.v0._1_0.channel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Map; + /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes SNS channel binding. * - * @version 0.1.0 * @see SNS channel binding + * @see SNS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data +@Builder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SNSChannelBinding extends com.asyncapi.bindings.sns.SNSChannelBinding { + /** + * The name of the topic. + *

+ * Can be different from the channel name to allow flexibility around AWS resource naming limitations. + */ + @NotNull + @Builder.Default + private String name = ""; + + /** + * This field allows configuration of a FIFO SNS Topic. + */ + @Nullable + private SNSChannelOrdering ordering; + + /** + * + */ + @Nullable + private SNSChannelPolicy policy; + + /** + * Key-value pairs that represent AWS tags on the topic. + */ + @Nullable + private Map tags; + @Override public String getBindingVersion() { return "0.1.0"; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrdering.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrdering.java new file mode 100644 index 00000000..e6d7db0e --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrdering.java @@ -0,0 +1,37 @@ +package com.asyncapi.bindings.sns.v0._1_0.channel; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * By default, we assume an unordered SNS topic. This field allows configuration of a FIFO SNS Topic. + * + * @see SNS channel binding + * @see SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SNSChannelOrdering { + + /** + * Defines the type of SNS Topic. + */ + @NotNull + private SNSChannelOrderingType type; + + /** + * True to turn on de-duplication of messages for a channel. + */ + @Nullable + private Boolean contentBasedDeduplication; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrderingType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrderingType.java new file mode 100644 index 00000000..c047e21c --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrderingType.java @@ -0,0 +1,22 @@ +package com.asyncapi.bindings.sns.v0._1_0.channel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Defines the type of SNS Topic. + * + * @see SNS channel binding + * @see SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +public enum SNSChannelOrderingType { + + @JsonProperty("standard") + STANDARD, + + @JsonProperty("FIFO") + FIFO + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicy.java new file mode 100644 index 00000000..8a66994d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicy.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.sns.v0._1_0.channel; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; + +import java.util.Collections; +import java.util.List; + +/** + * The security policy for the SNS Topic. + * + * @see SNS channel binding + * @see SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SNSChannelPolicy { + + /** + * An array of statement objects, each of which controls a permission for this topic + */ + @NotNull + private List<@NotNull SNSChannelPolicyStatement> statements = Collections.emptyList(); + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java new file mode 100644 index 00000000..459db08a --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java @@ -0,0 +1,44 @@ +package com.asyncapi.bindings.sns.v0._1_0.channel; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +/** + * The security policy for the SNS Topic. + * + * @see SNS channel binding + * @see SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SNSChannelPolicyStatement { + + /** + * The SNS rule to allow or deny actions. + */ + @NotNull + private SNSChannelPolicyStatementEffect effect; + + /** + * The AWS account or resource ARN that this statement applies to. + */ + @NotNull + private Object principal; + + /** + * The SNS permission being allowed or denied e.g. sns:Publish. + */ + @NotNull + private Object action; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatementEffect.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatementEffect.java new file mode 100644 index 00000000..469a88da --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatementEffect.java @@ -0,0 +1,13 @@ +package com.asyncapi.bindings.sns.v0._1_0.channel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public enum SNSChannelPolicyStatementEffect { + + @JsonProperty("Allow") + ALLOW, + + @JsonProperty("Deny") + DENY + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java index ae446a6e..322966e3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java @@ -10,9 +10,11 @@ *

* Describes SNS message binding. * - * @version 0.1.0 * @see SNS message binding + * @see SNS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java index 98b5443f..373809f4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java @@ -1,24 +1,50 @@ package com.asyncapi.bindings.sns.v0._1_0.operation; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Collections; +import java.util.List; + /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes SNS operation binding. * - * @version 0.1.0 * @see SNS operation binding + * @see SNS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data +@Builder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SNSOperationBinding extends com.asyncapi.bindings.sns.SNSOperationBinding { + /** + * Often we can assume that the SNS Topic is the channel name-we provide this field in case the you need to + * supply the ARN, or the Topic name is not the channel name in the AsyncAPI document. + */ + @Nullable + private SNSOperationDestinationIdentifier topic; + + /** + * The protocols that listen to this topic and their endpoints. + */ + @NotNull + @Builder.Default + @javax.validation.constraints.Size(min = 1) + private List<@NotNull SNSOperationConsumer> consumers = Collections.emptyList(); + + /** + * Policy for retries to HTTP. The field is the default for HTTP receivers of the SNS Topic + * which may be overridden by a specific consumer. + */ + @Nullable + private Object deliveryPolicy; + @Override public String getBindingVersion() { return "0.1.0"; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumer.java new file mode 100644 index 00000000..0a81c1f3 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumer.java @@ -0,0 +1,87 @@ +package com.asyncapi.bindings.sns.v0._1_0.operation; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Describes SNS operation topic consumer. + * + * @see SNS operation binding + * @see SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SNSOperationConsumer { + + /** + * The protocol that this endpoint receives messages by. + */ + @NotNull + private SNSOperationConsumerProtocol protocol; + + /** + * The endpoint messages are delivered to. + */ + @NotNull + private SNSOperationDestinationIdentifier endpoint; + + /** + * Only receive a subset of messages from the channel, determined by this policy. + *

+ * Depending on the FilterPolicyScope, a map of either a message attribute or message body to an array of possible matches. + *

+ * The match may be a simple string for an exact match, but it may also be an object that represents a constraint and values for that constraint. + *

+ * Possible variants: + *

    + *
  • List<String>
    • + *
  • String
    • + *
  • Object
    • + *
+ */ + @Nullable + private Object filterPolicy; + + /** + * Determines whether the FilterPolicy applies to MessageAttributes or MessageBody. + */ + @Nullable + @Builder.Default + private SNSOperationConsumerFilterPolicyScope filterPolicyScope = SNSOperationConsumerFilterPolicyScope.MESSAGE_ATTRIBUTES; + + /** + * If true AWS SNS attributes are removed from the body, and for SQS, SNS message attributes are copied to SQS message attributes. + *

+ * If false the SNS attributes are included in the body. + */ + @NotNull + private Boolean rawMessageDelivery; + + /** + * Prevent poison pill messages by moving un-processable messages to an SQS dead letter queue. + */ + @Nullable + private SNSOperationConsumerRedrivePolicy redrivePolicy; + + /** + * Policy for retries to HTTP. The parameter is for that SNS Subscription and overrides any policy on the SNS Topic. + */ + @Nullable + private SNSOperationConsumerDeliveryPolicy deliveryPolicy; + + /** + * The display name to use with an SNS subscription + */ + @Nullable + private String displayName; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicy.java new file mode 100644 index 00000000..d1466afb --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicy.java @@ -0,0 +1,72 @@ +package com.asyncapi.bindings.sns.v0._1_0.operation; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * Describes SNS operation delivery policy. + * + * @see SNS operation binding + * @see SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SNSOperationConsumerDeliveryPolicy { + + /** + * The minimum delay for a retry in seconds. + */ + @Nullable + private Integer minDelayTarget; + + /** + * The maximum delay for a retry in seconds. + */ + @Nullable + private Integer maxDelayTarget; + + /** + * The total number of retries, including immediate, pre-backoff, backoff, and post-backoff retries. + */ + @Nullable + private Integer numRetries; + + /** + * The number of immediate retries (with no delay). + */ + @Nullable + private Integer numNoDelayRetries; + + /** + * The number of immediate retries (with delay). + */ + @Nullable + private Integer numMinDelayRetries; + + /** + * The number of post-backoff phase retries, with the maximum delay between retries. + */ + @Nullable + private Integer numMaxDelayRetries; + + /** + * The algorithm for backoff between retries. + */ + @Nullable + private SNSOperationConsumerDeliveryPolicyBackoffFunction backoffFunction; + + /** + * The maximum number of deliveries per second, per subscription. + */ + @Nullable + private Integer maxReceivesPerSecond; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicyBackoffFunction.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicyBackoffFunction.java new file mode 100644 index 00000000..1a208fd6 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicyBackoffFunction.java @@ -0,0 +1,19 @@ +package com.asyncapi.bindings.sns.v0._1_0.operation; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public enum SNSOperationConsumerDeliveryPolicyBackoffFunction { + + @JsonProperty("arithmetic") + ARITHMETIC, + + @JsonProperty("exponential") + EXPONENTIAL, + + @JsonProperty("geometric") + GEOMETRIC, + + @JsonProperty("linear") + LINEAR + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerFilterPolicyScope.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerFilterPolicyScope.java new file mode 100644 index 00000000..8c4200a2 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerFilterPolicyScope.java @@ -0,0 +1,13 @@ +package com.asyncapi.bindings.sns.v0._1_0.operation; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public enum SNSOperationConsumerFilterPolicyScope { + + @JsonProperty("MessageAttributes") + MESSAGE_ATTRIBUTES, + + @JsonProperty("MessageBody") + MESSAGE_BODY + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerProtocol.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerProtocol.java new file mode 100644 index 00000000..33ea109b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerProtocol.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.sns.v0._1_0.operation; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public enum SNSOperationConsumerProtocol { + + @JsonProperty("http") + HTTP, + + @JsonProperty("https") + HTTPS, + + @JsonProperty("email") + EMAIL, + + @JsonProperty("email-json") + EMAIL_JSON, + + @JsonProperty("sms") + SMS, + + @JsonProperty("sqs") + SQS, + + @JsonProperty("application") + APPLICATION, + + @JsonProperty("lambda") + LAMBDA, + + @JsonProperty("firehose") + FIREHOSE + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerRedrivePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerRedrivePolicy.java new file mode 100644 index 00000000..d5e14c6f --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerRedrivePolicy.java @@ -0,0 +1,40 @@ +package com.asyncapi.bindings.sns.v0._1_0.operation; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Describes SNS operation consumer redrive policy. + *

+ * Prevent poison pill messages by moving un-processable messages to an SQS dead letter queue. + * + * @see SNS operation binding + * @see SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SNSOperationConsumerRedrivePolicy { + + /** + * The SQS queue to use as a dead letter queue (DLQ). + */ + @NotNull + private SNSOperationDestinationIdentifier deadLetterQueue; + + /** + * The number of times a message is delivered to the source queue before being moved to the dead-letter queue. + */ + @Nullable + @Builder.Default + private Integer maxReceiveCount = 10; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationDestinationIdentifier.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationDestinationIdentifier.java new file mode 100644 index 00000000..6ac249f1 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationDestinationIdentifier.java @@ -0,0 +1,61 @@ +package com.asyncapi.bindings.sns.v0._1_0.operation; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * Describes SNS operation destination identifier. + * + * @see SNS operation binding + * @see SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SNSOperationDestinationIdentifier { + + /** + * The endpoint is a URL. + */ + @Nullable + private String url; + + /** + * The endpoint is an email address. + */ + @Nullable + private String email; + + /** + * The endpoint is a phone number. + */ + @Nullable + private String phone; + + /** + * The target is an ARN. + *

+ * For example, for SQS, the identifier may be an ARN, which will be of the form: arn:aws:sqs:{region}:{account-id}:{queueName} + */ + @Nullable + private String arn; + + /** + * The endpoint is identified by a name, which corresponds to an identifying + * field called name of a binding for that protocol on this publish Operation Object. + *

+ * For example, if the protocol is 'sqs' then the name refers to the name field sqs binding. + *

+ * We don't use $ref because we are referring, not including. + */ + @Nullable + private String name; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java index d51a62d0..d661e143 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java @@ -10,9 +10,11 @@ *

* Describes SNS server binding. * - * @version 0.1.0 * @see SNS server binding + * @see SNS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSLatestTest.java index fd8ac8f9..ccabb501 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSLatestTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSLatestTest.java @@ -16,9 +16,9 @@ public class SNSLatestTest { class ChannelTest extends BindingTest {{ super.binding = SNSV0_1_0Test.channelBinding(); super.bindingTypeClass = SNSChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/latest/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/channel/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/latest/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/latest/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/latest/channel/binding - wrongly extended.json"; }} @Nested @@ -26,9 +26,9 @@ class ChannelTest extends BindingTest {{ class Message extends BindingTest {{ super.binding = SNSV0_1_0Test.messageBinding(); super.bindingTypeClass = SNSMessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/latest/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/latest/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/message/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/latest/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/latest/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/latest/message/binding - wrongly extended.json"; }} @Nested @@ -36,9 +36,9 @@ class Message extends BindingTest {{ class Operation extends BindingTest {{ super.binding = SNSV0_1_0Test.operationBinding(); super.bindingTypeClass = SNSOperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/latest/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/operation/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/latest/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/latest/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/latest/operation/binding - wrongly extended.json"; }} @Nested @@ -46,9 +46,9 @@ class Operation extends BindingTest {{ class Server extends BindingTest {{ super.binding = SNSV0_1_0Test.serverBinding(); super.bindingTypeClass = SNSServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/latest/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/latest/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/latest/server/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/latest/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/latest/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/latest/server/binding - wrongly extended.json"; }} } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSUnknownVersionTest.java index c718522d..b75f0776 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSUnknownVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSUnknownVersionTest.java @@ -16,9 +16,9 @@ public class SNSUnknownVersionTest { class ChannelTest extends BindingTest {{ super.binding = SNSV0_1_0Test.channelBinding(); super.bindingTypeClass = SNSChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/channel/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/unknown version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/unknown version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/unknown version/channel/binding - wrongly extended.json"; }} @Nested @@ -26,9 +26,9 @@ class ChannelTest extends BindingTest {{ class Message extends BindingTest {{ super.binding = SNSV0_1_0Test.messageBinding(); super.bindingTypeClass = SNSMessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/message/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/unknown version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/unknown version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/unknown version/message/binding - wrongly extended.json"; }} @Nested @@ -36,9 +36,9 @@ class Message extends BindingTest {{ class Operation extends BindingTest {{ super.binding = SNSV0_1_0Test.operationBinding(); super.bindingTypeClass = SNSOperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/operation/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/unknown version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/unknown version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/unknown version/operation/binding - wrongly extended.json"; }} @Nested @@ -46,9 +46,9 @@ class Operation extends BindingTest {{ class Server extends BindingTest {{ super.binding = SNSV0_1_0Test.serverBinding(); super.bindingTypeClass = SNSServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/unknown version/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/unknown version/server/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/unknown version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/unknown version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/unknown version/server/binding - wrongly extended.json"; }} } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSV0_1_0Test.java index ec06983e..88ebb0fe 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSV0_1_0Test.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSV0_1_0Test.java @@ -2,17 +2,36 @@ import com.asyncapi.bindings.BindingTest; import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding; +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelPolicy; +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelPolicyStatement; +import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelPolicyStatementEffect; import com.asyncapi.bindings.sns.v0._1_0.message.SNSMessageBinding; import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding; +import com.asyncapi.bindings.sns.v0._1_0.operation.*; import com.asyncapi.bindings.sns.v0._1_0.server.SNSServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + @DisplayName("0.1.0") public class SNSV0_1_0Test { public static SNSChannelBinding channelBinding () { - return new SNSChannelBinding(); + return SNSChannelBinding.builder() + .name("my-sns-topic") + .policy(SNSChannelPolicy.builder() + .statements(List.of(SNSChannelPolicyStatement.builder() + .effect(SNSChannelPolicyStatementEffect.ALLOW) + .principal("*") + .action("SNS:Publish") + .build() + )) + .build() + ) + .build(); } public static SNSMessageBinding messageBinding () { @@ -20,7 +39,48 @@ public static SNSMessageBinding messageBinding () { } public static SNSOperationBinding operationBinding () { - return new SNSOperationBinding(); + var filterPolicy = new LinkedHashMap(); + filterPolicy.put("store", List.of("asyncapi_corp")); + filterPolicy.put("event", List.of(Map.ofEntries(Map.entry("anything-but", "order_cancelled")))); + filterPolicy.put("customer_interests", List.of("rugby", "football", "baseball")); + + return SNSOperationBinding.builder() + .topic(SNSOperationDestinationIdentifier.builder() + .name("someTopic") + .build() + ) + .consumers(List.of( + SNSOperationConsumer.builder() + .protocol(SNSOperationConsumerProtocol.SQS) + .endpoint(SNSOperationDestinationIdentifier.builder() + .name("someQueue") + .build() + ) + .filterPolicy(filterPolicy) + .filterPolicyScope(SNSOperationConsumerFilterPolicyScope.MESSAGE_ATTRIBUTES) + .rawMessageDelivery(false) + .redrivePolicy(SNSOperationConsumerRedrivePolicy.builder() + .deadLetterQueue(SNSOperationDestinationIdentifier.builder() + .arn("arn:aws:SQS:eu-west-1:0000000:123456789") + .build() + ) + .maxReceiveCount(25) + .build() + ) + .deliveryPolicy(SNSOperationConsumerDeliveryPolicy.builder() + .minDelayTarget(10) + .maxDelayTarget(100) + .numRetries(5) + .numNoDelayRetries(2) + .numMinDelayRetries(3) + .numMaxDelayRetries(5) + .backoffFunction(SNSOperationConsumerDeliveryPolicyBackoffFunction.LINEAR) + .maxReceivesPerSecond(2) + .build() + ) + .build() + )) + .build(); } public static SNSServerBinding serverBinding () { @@ -32,9 +92,9 @@ public static SNSServerBinding serverBinding () { class ChannelTest extends BindingTest {{ super.binding = channelBinding(); super.bindingTypeClass = SNSChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/0.1.0/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/0.1.0/channel/binding - wrongly extended.json"; }} @Nested @@ -42,9 +102,9 @@ class ChannelTest extends BindingTest {{ class Message extends BindingTest {{ super.binding = messageBinding(); super.bindingTypeClass = SNSMessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/0.1.0/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/0.1.0/message/binding - wrongly extended.json"; }} @Nested @@ -52,9 +112,9 @@ class Message extends BindingTest {{ class Operation extends BindingTest {{ super.binding = operationBinding(); super.bindingTypeClass = SNSOperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/0.1.0/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/0.1.0/operation/binding - wrongly extended.json"; }} @Nested @@ -62,9 +122,9 @@ class Operation extends BindingTest {{ class Server extends BindingTest {{ super.binding = serverBinding(); super.bindingTypeClass = SNSServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/0.1.0/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/0.1.0/server/binding - wrongly extended.json"; }} } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSWithoutVersionTest.java index e0a6a332..fd5e941b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSWithoutVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/sns/SNSWithoutVersionTest.java @@ -16,9 +16,9 @@ public class SNSWithoutVersionTest { class ChannelTest extends BindingTest {{ super.binding = SNSV0_1_0Test.channelBinding(); super.bindingTypeClass = SNSChannelBinding.class; - super.pathToBindingJson = "/bindings/default implementation/without version/channel/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/channel/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/without version/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/without version/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/without version/channel/binding - wrongly extended.json"; }} @Nested @@ -26,9 +26,9 @@ class ChannelTest extends BindingTest {{ class Message extends BindingTest {{ super.binding = SNSV0_1_0Test.messageBinding(); super.bindingTypeClass = SNSMessageBinding.class; - super.pathToBindingJson = "/bindings/default implementation/without version/message/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/without version/message/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/message/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/without version/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/without version/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/without version/message/binding - wrongly extended.json"; }} @Nested @@ -36,9 +36,9 @@ class Message extends BindingTest {{ class Operation extends BindingTest {{ super.binding = SNSV0_1_0Test.operationBinding(); super.bindingTypeClass = SNSOperationBinding.class; - super.pathToBindingJson = "/bindings/default implementation/without version/operation/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/operation/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/without version/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/without version/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/without version/operation/binding - wrongly extended.json"; }} @Nested @@ -46,9 +46,9 @@ class Operation extends BindingTest {{ class Server extends BindingTest {{ super.binding = SNSV0_1_0Test.serverBinding(); super.bindingTypeClass = SNSServerBinding.class; - super.pathToBindingJson = "/bindings/default implementation/without version/server/binding.json"; - super.pathToExtendedBindingJson = "/bindings/default implementation/without version/server/binding - extended.json"; - super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/without version/server/binding - wrongly extended.json"; + super.pathToBindingJson = "/bindings/sns/without version/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/sns/without version/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/sns/without version/server/binding - wrongly extended.json"; }} } diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index be7be095..a7b38642 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -19,7 +19,7 @@ import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.redis.v0._1_0.channel.RedisChannelBinding -import com.asyncapi.bindings.sns.v0._1_0.channel.SNSChannelBinding +import com.asyncapi.bindings.sns.SNSV0_1_0Test import com.asyncapi.bindings.solace.v0._4_0.channel.SolaceChannelBinding import com.asyncapi.bindings.sqs.SQSV0_2_0Test import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding @@ -69,7 +69,7 @@ class ChannelItemTest: SerDeTest() { Pair("nats", NATSChannelBinding()), Pair("pulsar", PulsarV0_1_0Test.channelBinding()), Pair("redis", RedisChannelBinding()), - Pair("sns", SNSChannelBinding()), + Pair("sns", SNSV0_1_0Test.channelBinding()), Pair("solace", SolaceChannelBinding()), Pair("sqs", SQSV0_2_0Test.channelBinding()), Pair("stomp", STOMPChannelBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 1a4a31d7..19ec20c2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -20,7 +20,7 @@ import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.pulsar.v0._1_0.operation.PulsarOperationBinding import com.asyncapi.bindings.redis.v0._1_0.operation.RedisOperationBinding -import com.asyncapi.bindings.sns.v0._1_0.operation.SNSOperationBinding +import com.asyncapi.bindings.sns.SNSV0_1_0Test import com.asyncapi.bindings.solace.SolaceV0_4_0Test import com.asyncapi.bindings.sqs.SQSV0_2_0Test import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding @@ -115,7 +115,7 @@ class OperationTest { Pair("nats", NATSV0_1_0Test.operationBinding()), Pair("pulsar", PulsarOperationBinding()), Pair("redis", RedisOperationBinding()), - Pair("sns", SNSOperationBinding()), + Pair("sns", SNSV0_1_0Test.operationBinding()), Pair("solace", SolaceV0_4_0Test.operationBinding()), Pair("sqs", SQSV0_2_0Test.operationBinding()), Pair("stomp", STOMPOperationBinding()), diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding - extended.json new file mode 100644 index 00000000..1379d1e2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding - extended.json @@ -0,0 +1,16 @@ +{ + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a0596141 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding - wrongly extended.json @@ -0,0 +1,19 @@ +{ + "bindingVersion": "0.1.0", + "name": "my-sns-topic", + "policy": { + "statements": [ + { + "effect": "Allow", + "principal": "*", + "action": "SNS:Publish" + } + ] + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding.json new file mode 100644 index 00000000..2b738eca --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/channel/binding.json @@ -0,0 +1,13 @@ +{ + "name": "my-sns-topic", + "policy": { + "statements": [ + { + "effect": "Allow", + "principal": "*", + "action": "SNS:Publish" + } + ] + }, + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding - extended.json new file mode 100644 index 00000000..b2abbf7d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding - extended.json @@ -0,0 +1,42 @@ +{ + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..d4e53949 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding - wrongly extended.json @@ -0,0 +1,53 @@ +{ + "bindingVersion": "0.1.0", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ], + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding.json new file mode 100644 index 00000000..3c2dd78b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/operation/binding.json @@ -0,0 +1,47 @@ +{ + "bindingVersion": "0.1.0", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/0.1.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding - extended.json new file mode 100644 index 00000000..1379d1e2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding - extended.json @@ -0,0 +1,16 @@ +{ + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding - wrongly extended.json new file mode 100644 index 00000000..90d7b0fc --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding - wrongly extended.json @@ -0,0 +1,19 @@ +{ + "bindingVersion": "latest", + "name": "my-sns-topic", + "policy": { + "statements": [ + { + "effect": "Allow", + "principal": "*", + "action": "SNS:Publish" + } + ] + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding.json b/asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding.json new file mode 100644 index 00000000..e939fc04 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/channel/binding.json @@ -0,0 +1,13 @@ +{ + "bindingVersion": "latest", + "name": "my-sns-topic", + "policy": { + "statements": [ + { + "effect": "Allow", + "principal": "*", + "action": "SNS:Publish" + } + ] + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/latest/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/latest/message/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/sns/latest/message/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding - extended.json new file mode 100644 index 00000000..b2abbf7d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding - extended.json @@ -0,0 +1,42 @@ +{ + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding - wrongly extended.json new file mode 100644 index 00000000..3c5bfe42 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding - wrongly extended.json @@ -0,0 +1,53 @@ +{ + "bindingVersion": "latest", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ], + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding.json new file mode 100644 index 00000000..1adb799a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/operation/binding.json @@ -0,0 +1,47 @@ +{ + "bindingVersion": "latest", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/latest/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/latest/server/binding - wrongly extended.json new file mode 100644 index 00000000..18560ee8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "latest", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/sns/latest/server/binding.json new file mode 100644 index 00000000..cdf165f6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/latest/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "latest" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding - extended.json new file mode 100644 index 00000000..1379d1e2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding - extended.json @@ -0,0 +1,16 @@ +{ + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..48201a7c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding - wrongly extended.json @@ -0,0 +1,19 @@ +{ + "bindingVersion": "0.199.36", + "name": "my-sns-topic", + "policy": { + "statements": [ + { + "effect": "Allow", + "principal": "*", + "action": "SNS:Publish" + } + ] + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding.json new file mode 100644 index 00000000..5af29617 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/channel/binding.json @@ -0,0 +1,13 @@ +{ + "bindingVersion": "0.199.36", + "name": "my-sns-topic", + "policy": { + "statements": [ + { + "effect": "Allow", + "principal": "*", + "action": "SNS:Publish" + } + ] + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/message/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding - extended.json new file mode 100644 index 00000000..b2abbf7d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding - extended.json @@ -0,0 +1,42 @@ +{ + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..65b0ec8d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding - wrongly extended.json @@ -0,0 +1,53 @@ +{ + "bindingVersion": "0.199.36", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ], + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding.json new file mode 100644 index 00000000..c7888286 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/operation/binding.json @@ -0,0 +1,47 @@ +{ + "bindingVersion": "0.199.36", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding - wrongly extended.json new file mode 100644 index 00000000..62eff98f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.199.36", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding.json new file mode 100644 index 00000000..1394045a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/unknown version/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.199.36" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding - extended.json new file mode 100644 index 00000000..1379d1e2 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding - extended.json @@ -0,0 +1,16 @@ +{ + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding - wrongly extended.json new file mode 100644 index 00000000..3b4be92c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "name": "my-sns-topic", + "policy": { + "statements": [ + { + "effect": "Allow", + "principal": "*", + "action": "SNS:Publish" + } + ] + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding.json b/asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding.json new file mode 100644 index 00000000..8b95c79c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/channel/binding.json @@ -0,0 +1,12 @@ +{ + "name": "my-sns-topic", + "policy": { + "statements": [ + { + "effect": "Allow", + "principal": "*", + "action": "SNS:Publish" + } + ] + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/without version/message/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/message/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/without version/message/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/message/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/sns/without version/message/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/message/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding - extended.json new file mode 100644 index 00000000..b2abbf7d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding - extended.json @@ -0,0 +1,42 @@ +{ + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding - wrongly extended.json new file mode 100644 index 00000000..8ba5eb05 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding - wrongly extended.json @@ -0,0 +1,52 @@ +{ + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ], + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding.json new file mode 100644 index 00000000..756aadbe --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/operation/binding.json @@ -0,0 +1,46 @@ +{ + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/sns/without version/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/sns/without version/server/binding - wrongly extended.json new file mode 100644 index 00000000..a16bbdf8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/server/binding - wrongly extended.json @@ -0,0 +1,8 @@ +{ + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/sns/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/sns/without version/server/binding.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/sns/without version/server/binding.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 22dc0213..5c067cfa 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -212,6 +212,40 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -369,6 +403,7 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "consumers" : [ ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -529,6 +564,40 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -686,6 +755,7 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "consumers" : [ ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -1020,6 +1090,14 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, "bindingVersion" : "0.1.0" }, "solace" : { @@ -1492,6 +1570,7 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "consumers" : [ ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -1882,6 +1961,14 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, "bindingVersion" : "0.1.0" }, "solace" : { @@ -2031,6 +2118,40 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], "bindingVersion" : "0.1.0" }, "solace" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json index 49b7bc87..f1188d16 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json @@ -175,7 +175,43 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0" + }, "solace" : { "destinations": [ { @@ -469,7 +505,43 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0" + }, "solace" : { "destinations": [ { @@ -935,7 +1007,17 @@ "bindingVersion": "0.1.0" }, "redis": { }, - "sns": { }, + "sns": { + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, + "bindingVersion" : "0.1.0" + }, "solace": { }, "sqs": { "queue" : { @@ -1719,7 +1801,17 @@ "bindingVersion": "0.1.0" }, "redis": { }, - "sns": { }, + "sns": { + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, + "bindingVersion" : "0.1.0" + }, "solace": { }, "sqs": { "queue" : { @@ -1843,7 +1935,43 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0" + }, "solace" : { "destinations": [ { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index 86f15bea..b37d441b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -94,6 +94,40 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -251,6 +285,7 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "consumers" : [ ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -411,6 +446,40 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -568,6 +637,7 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "consumers" : [ ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -902,6 +972,14 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, "bindingVersion" : "0.1.0" }, "solace" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json index 7d417435..11fba602 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json @@ -77,7 +77,53 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "bindingVersion": "0.1.0", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] + }, "solace" : { "dmqEligible" : false, "bindingVersion" : "0.4.0", @@ -295,7 +341,53 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "bindingVersion": "0.1.0", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] + }, "solace" : { "dmqEligible" : false, "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json index 54fcbe42..553e1de4 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json @@ -77,7 +77,43 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0" + }, "solace" : { "dmqEligible" : false, "bindingVersion" : "0.4.0", @@ -361,7 +397,43 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0" + }, "solace" : { "dmqEligible" : false, "bindingVersion" : "0.4.0", @@ -817,7 +889,17 @@ "bindingVersion": "0.1.0" }, "redis": { }, - "sns": { }, + "sns": { + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, + "bindingVersion" : "0.1.0" + }, "solace": { }, "sqs": { "queue": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index 2bf32355..f6aada7d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -92,6 +92,40 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -249,6 +283,7 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "consumers" : [ ], "bindingVersion" : "0.1.0" }, "solace" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json index 7d3bd21d..d96877fc 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json @@ -75,7 +75,53 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "bindingVersion": "0.1.0", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] + }, "solace" : { "dmqEligible" : false, "bindingVersion" : "0.4.0", @@ -188,7 +234,9 @@ }, "pulsar": {}, "redis": {}, - "sns": {}, + "sns": { + "consumers" : [] + }, "solace": { "dmqEligible" : false, "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json index bcfa7702..14042f0e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json @@ -75,7 +75,53 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "bindingVersion": "0.1.0", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] + }, "solace" : { "dmqEligible" : false, "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index d30669bf..3e9e3607 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -92,6 +92,40 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -249,6 +283,7 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "consumers" : [ ], "bindingVersion" : "0.1.0" }, "solace" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json index 7cfed3c9..7604eeb4 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json @@ -75,7 +75,53 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "bindingVersion": "0.1.0", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] + }, "solace" : { "dmqEligible" : false, "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json index 8161286f..c1e4f78e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json @@ -75,7 +75,53 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "bindingVersion": "0.1.0", + "topic": { + "name": "someTopic" + }, + "consumers": [ + { + "protocol": "sqs", + "endpoint": { + "name": "someQueue" + }, + "filterPolicy": { + "store": [ + "asyncapi_corp" + ], + "event": [ + { + "anything-but": "order_cancelled" + } + ], + "customer_interests": [ + "rugby", + "football", + "baseball" + ] + }, + "filterPolicyScope": "MessageAttributes", + "rawMessageDelivery": false, + "redrivePolicy": { + "deadLetterQueue": { + "arn": "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount": 25 + }, + "deliveryPolicy": { + "minDelayTarget": 10, + "maxDelayTarget": 100, + "numRetries": 5, + "numNoDelayRetries": 2, + "numMinDelayRetries": 3, + "numMaxDelayRetries": 5, + "backoffFunction": "linear", + "maxReceivesPerSecond": 2 + } + } + ] + }, "solace" : { "dmqEligible" : false, "bindingVersion" : "0.4.0", diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index 8d071a33..cd1ee0c6 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -92,6 +92,7 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "consumers" : [ ], "bindingVersion" : "0.1.0" }, "solace" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index cf62e09a..bce56e46 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -397,6 +397,7 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "consumers" : [ ], "bindingVersion" : "0.1.0" }, "solace" : { @@ -787,6 +788,14 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, "bindingVersion" : "0.1.0" }, "solace" : { @@ -936,6 +945,40 @@ "bindingVersion" : "0.1.0" }, "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], "bindingVersion" : "0.1.0" }, "solace" : { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json index 77d9a079..37f3072d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json @@ -714,7 +714,17 @@ "bindingVersion": "0.1.0" }, "redis": { }, - "sns": { }, + "sns": { + "name" : "my-sns-topic", + "policy" : { + "statements" : [ { + "effect" : "Allow", + "principal" : "*", + "action" : "SNS:Publish" + } ] + }, + "bindingVersion" : "0.1.0" + }, "solace": { }, "sqs": { "queue" : { @@ -837,7 +847,43 @@ }, "pulsar" : { }, "redis" : { }, - "sns" : { }, + "sns" : { + "topic" : { + "name" : "someTopic" + }, + "consumers" : [ { + "protocol" : "sqs", + "endpoint" : { + "name" : "someQueue" + }, + "filterPolicy" : { + "store" : [ "asyncapi_corp" ], + "event" : [ { + "anything-but" : "order_cancelled" + } ], + "customer_interests" : [ "rugby", "football", "baseball" ] + }, + "filterPolicyScope" : "MessageAttributes", + "rawMessageDelivery" : false, + "redrivePolicy" : { + "deadLetterQueue" : { + "arn" : "arn:aws:SQS:eu-west-1:0000000:123456789" + }, + "maxReceiveCount" : 25 + }, + "deliveryPolicy" : { + "minDelayTarget" : 10, + "maxDelayTarget" : 100, + "numRetries" : 5, + "numNoDelayRetries" : 2, + "numMinDelayRetries" : 3, + "numMaxDelayRetries" : 5, + "backoffFunction" : "linear", + "maxReceivesPerSecond" : 2 + } + } ], + "bindingVersion" : "0.1.0" + }, "solace" : { "destinations": [ { From 45923b4ea50db0b5e8710737aa78572d058026a5 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 13 May 2024 01:03:21 +0400 Subject: [PATCH 102/141] feat(bindings): MQTT 5 0.1.0 --- .../bindings/mqtt5/MQTT5ChannelBinding.java | 6 +- .../bindings/mqtt5/MQTT5MessageBinding.java | 6 +- .../bindings/mqtt5/MQTT5OperationBinding.java | 6 +- .../bindings/mqtt5/MQTT5ServerBinding.java | 4 +- .../asyncapi/bindings/mqtt5/package-info.java | 9 +++ .../v0/_1_0/channel/MQTT5ChannelBinding.java | 34 +++++++++ .../v0/_1_0/message/MQTT5MessageBinding.java | 34 +++++++++ .../_1_0/operation/MQTT5OperationBinding.java | 34 +++++++++ .../v0/_1_0/server/MQTT5ServerBinding.java | 33 +++++++++ .../bindings/mqtt5/MQTT5V0_1_0Test.java | 70 +++++++++++++++++++ 10 files changed, 226 insertions(+), 10 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/package-info.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/channel/MQTT5ChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/message/MQTT5MessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/operation/MQTT5OperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/server/MQTT5ServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5V0_1_0Test.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ChannelBinding.java index 00d631ed..ebf82916 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ChannelBinding.java @@ -6,13 +6,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes MQTT 5 channel binding. * - * @version 0.2.0 * @see MQTT 5 channel binding + * @see MQTT 5 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, @@ -22,6 +21,7 @@ visible = true ) @JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._1_0.channel.MQTT5ChannelBinding.class, name = "0.1.0"), @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding.class, names = { "0.2.0", "latest" diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5MessageBinding.java index b83f565b..c736f290 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5MessageBinding.java @@ -6,13 +6,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes MQTT 5 message binding. * - * @version 0.2.0 * @see MQTT 5 message binding + * @see MQTT 5 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, @@ -22,6 +21,7 @@ visible = true ) @JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._1_0.message.MQTT5MessageBinding.class, name = "0.1.0"), @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding.class, names = { "0.2.0", "latest" diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5OperationBinding.java index b58b3c1a..27f30812 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5OperationBinding.java @@ -6,13 +6,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes MQTT 5 operation binding. * - * @version 0.2.0 * @see MQTT 5 operation binding + * @see MQTT 5 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, @@ -22,6 +21,7 @@ visible = true ) @JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._1_0.operation.MQTT5OperationBinding.class, name = "0.1.0"), @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding.class, names = { "0.2.0", "latest" diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ServerBinding.java index 6a8cf52b..996cd92f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/MQTT5ServerBinding.java @@ -8,9 +8,10 @@ /** * Describes MQTT 5 server binding. * - * @version 0.2.0 * @see MQTT 5 server binding + * @see MQTT 5 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, @@ -20,6 +21,7 @@ visible = true ) @JsonSubTypes({ + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._1_0.server.MQTT5ServerBinding.class, name = "0.1.0"), @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt5.v0._2_0.server.MQTT5ServerBinding.class, names = { "0.2.0", "latest" diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/package-info.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/package-info.java new file mode 100644 index 00000000..e4f5b8e5 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/package-info.java @@ -0,0 +1,9 @@ +/** + *

Deprecation Warning:

+ *

+ * MQTT version 5 specific bindings are deprecated in favor of MQTT bindings that are not version specific. + * + * @see com.asyncapi.bindings.mqtt + */ +@Deprecated +package com.asyncapi.bindings.mqtt5; \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/channel/MQTT5ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/channel/MQTT5ChannelBinding.java new file mode 100644 index 00000000..2fc0e88f --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/channel/MQTT5ChannelBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.mqtt5.v0._1_0.channel; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes MQTT 5 channel binding. + * + * @see MQTT 5 channel binding + * @see MQTT 5 + * @version 0.1.0 + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class MQTT5ChannelBinding extends com.asyncapi.bindings.mqtt5.MQTT5ChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/message/MQTT5MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/message/MQTT5MessageBinding.java new file mode 100644 index 00000000..9b26057f --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/message/MQTT5MessageBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.mqtt5.v0._1_0.message; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes MQTT 5 message binding. + * + * @see MQTT 5 message binding + * @see MQTT 5 + * @version 0.1.0 + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class MQTT5MessageBinding extends com.asyncapi.bindings.mqtt5.MQTT5MessageBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/operation/MQTT5OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/operation/MQTT5OperationBinding.java new file mode 100644 index 00000000..0f9f2272 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/operation/MQTT5OperationBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.mqtt5.v0._1_0.operation; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes MQTT 5 operation binding. + * + * @see MQTT 5 operation binding + * @see MQTT 5 + * @version 0.1.0 + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class MQTT5OperationBinding extends com.asyncapi.bindings.mqtt5.MQTT5OperationBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/server/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/server/MQTT5ServerBinding.java new file mode 100644 index 00000000..8a8286d1 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/server/MQTT5ServerBinding.java @@ -0,0 +1,33 @@ +package com.asyncapi.bindings.mqtt5.v0._1_0.server; + +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes MQTT 5 server binding. + * + * @see MQTT 5 server binding + * @see MQTT 5 + * @version 0.1.0 + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class MQTT5ServerBinding extends com.asyncapi.bindings.mqtt5.MQTT5ServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5V0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5V0_1_0Test.java new file mode 100644 index 00000000..d1f2fa28 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt5/MQTT5V0_1_0Test.java @@ -0,0 +1,70 @@ +package com.asyncapi.bindings.mqtt5; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt5.v0._1_0.channel.MQTT5ChannelBinding; +import com.asyncapi.bindings.mqtt5.v0._1_0.message.MQTT5MessageBinding; +import com.asyncapi.bindings.mqtt5.v0._1_0.operation.MQTT5OperationBinding; +import com.asyncapi.bindings.mqtt5.v0._1_0.server.MQTT5ServerBinding; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.1.0") +public class MQTT5V0_1_0Test { + + public static MQTT5ChannelBinding channelBinding () { + return new MQTT5ChannelBinding(); + } + + public static MQTT5MessageBinding messageBinding () { + return new MQTT5MessageBinding(); + } + + public static MQTT5OperationBinding operationBinding () { + return new MQTT5OperationBinding(); + } + + public static MQTT5ServerBinding serverBinding () { + return new MQTT5ServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = MQTT5ChannelBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = MQTT5MessageBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = MQTT5OperationBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = MQTT5ServerBinding.class; + super.pathToBindingJson = "/bindings/default implementation/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/default implementation/0.1.0/server/binding - wrongly extended.json"; + }} + +} From ea2fd397a9ca445f6e4102b5c15503323256406f Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 13 May 2024 02:46:06 +0400 Subject: [PATCH 103/141] feat(bindings): MQTT 0.2.0 --- .../bindings/mqtt/MQTTChannelBinding.java | 12 +-- .../bindings/mqtt/MQTTMessageBinding.java | 12 +-- .../bindings/mqtt/MQTTOperationBinding.java | 12 +-- .../bindings/mqtt/MQTTServerBinding.java | 12 +-- .../v0/_2_0/channel/MQTTChannelBinding.java | 34 ++++++ .../v0/_2_0/message/MQTTMessageBinding.java | 80 ++++++++++++++ .../_2_0/operation/MQTTOperationBinding.java | 83 ++++++++++++++ .../v0/_2_0/server/MQTTServerBinding.java | 102 ++++++++++++++++++ .../MQTTServerLastWillConfiguration.java | 67 ++++++++++++ ...eOrAsyncAPISchemaOrNumberDeserializer.java | 42 ++++++++ ...eOrAsyncAPISchemaOrStringDeserializer.java | 42 ++++++++ .../bindings/mqtt/MQTTLatestTest.java | 16 +-- .../bindings/mqtt/MQTTUnknownVersionTest.java | 16 +-- .../bindings/mqtt/MQTTV0_2_0Test.java | 96 +++++++++++++++++ .../bindings/mqtt/MQTTWithoutVersionTest.java | 16 +-- .../examples/v2/_0_0/StreetlightsMQTT.kt | 2 +- .../examples/v2/_6_0/StreetlightsMQTT.kt | 2 +- .../v3/_0_0/StreetlightsMQTTAsyncAPI.kt | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 2 +- .../0.2.0/channel/binding - extended.json | 8 ++ .../channel/binding - wrongly extended.json | 9 ++ .../bindings/mqtt/0.2.0/channel/binding.json | 3 + .../0.2.0/message/binding - extended.json | 15 +++ .../message/binding - wrongly extended.json | 15 +++ .../bindings/mqtt/0.2.0/message/binding.json | 9 ++ .../0.2.0/operation/binding - extended.json | 11 ++ .../operation/binding - wrongly extended.json | 12 +++ .../mqtt/0.2.0/operation/binding.json | 6 ++ .../mqtt/0.2.0/server/binding - extended.json | 19 ++++ .../server/binding - wrongly extended.json | 20 ++++ .../bindings/mqtt/0.2.0/server/binding.json | 14 +++ .../latest/channel/binding - extended.json | 2 +- .../latest/message/binding - extended.json | 9 +- .../message/binding - wrongly extended.json | 6 ++ .../bindings/mqtt/latest/message/binding.json | 6 ++ .../latest/operation/binding - extended.json | 3 +- .../operation/binding - wrongly extended.json | 1 + .../mqtt/latest/operation/binding.json | 1 + .../latest/server/binding - extended.json | 4 +- .../server/binding - wrongly extended.json | 2 + .../bindings/mqtt/latest/server/binding.json | 2 + .../channel/binding - extended.json | 2 +- .../message/binding - extended.json | 9 +- .../message/binding - wrongly extended.json | 6 ++ .../mqtt/unknown version/message/binding.json | 6 ++ .../operation/binding - extended.json | 3 +- .../operation/binding - wrongly extended.json | 1 + .../unknown version/operation/binding.json | 1 + .../server/binding - extended.json | 4 +- .../server/binding - wrongly extended.json | 2 + .../mqtt/unknown version/server/binding.json | 2 + .../channel/binding - extended.json | 2 +- .../message/binding - extended.json | 9 +- .../message/binding - wrongly extended.json | 6 ++ .../mqtt/without version/message/binding.json | 9 +- .../operation/binding - extended.json | 3 +- .../operation/binding - wrongly extended.json | 1 + .../without version/operation/binding.json | 3 +- .../server/binding - extended.json | 4 +- .../server/binding - wrongly extended.json | 2 + .../mqtt/without version/server/binding.json | 4 +- .../v2/2.0.0/model/asyncapi - extended.json | 4 +- .../model/channel/channelItem - extended.json | 2 +- .../components/components - extended.json | 2 +- 64 files changed, 843 insertions(+), 71 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/channel/MQTTChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerLastWillConfiguration.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrStringDeserializer.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTV0_2_0Test.java create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java index ccc41d93..ad900ee3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTChannelBinding.java @@ -6,24 +6,24 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes MQTT channel binding. * - * @version 0.1.0 * @see MQTT channel binding + * @see MQTT * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding.class, + defaultImpl = com.asyncapi.bindings.mqtt.v0._2_0.channel.MQTTChannelBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding.class, names = { - "0.1.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._2_0.channel.MQTTChannelBinding.class, names = { + "0.2.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java index e1d8cdfa..e6ad506f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTMessageBinding.java @@ -7,23 +7,23 @@ /** * Describes MQTT message binding. - *

- * Contains information about the message representation in MQTT. * - * @version 0.1.0 * @see MQTT message binding + * @see MQTT * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding.class, + defaultImpl = com.asyncapi.bindings.mqtt.v0._2_0.message.MQTTMessageBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding.class, names = { - "0.1.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._2_0.message.MQTTMessageBinding.class, names = { + "0.2.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java index 580cf77a..c4dbf21c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTOperationBinding.java @@ -7,23 +7,23 @@ /** * Describes MQTT operation binding. - *

- * Contains information about the operation representation in MQTT. * - * @version 0.1.0 * @see MQTT operation binding + * @see MQTT * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding.class, + defaultImpl = com.asyncapi.bindings.mqtt.v0._2_0.operation.MQTTOperationBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding.class, names = { - "0.1.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._2_0.operation.MQTTOperationBinding.class, names = { + "0.2.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java index 2002ecdd..69375552 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/MQTTServerBinding.java @@ -7,23 +7,23 @@ /** * Describes MQTT server binding. - *

- * Contains information about the server representation in MQTT. * - * @version 0.1.0 * @see MQTT server binding + * @see MQTT * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding.class, + defaultImpl = com.asyncapi.bindings.mqtt.v0._2_0.server.MQTTServerBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding.class, names = { - "0.1.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.mqtt.v0._2_0.server.MQTTServerBinding.class, names = { + "0.2.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/channel/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/channel/MQTTChannelBinding.java new file mode 100644 index 00000000..d82abe6c --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/channel/MQTTChannelBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.mqtt.v0._2_0.channel; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * This class MUST NOT contain any properties. Its name is reserved for future use. + *

+ * Describes MQTT channel binding. + * + * @see MQTT channel binding + * @see MQTT + * @version 0.2.0 + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class MQTTChannelBinding extends com.asyncapi.bindings.mqtt.MQTTChannelBinding { + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java new file mode 100644 index 00000000..41c2c0cc --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java @@ -0,0 +1,80 @@ +package com.asyncapi.bindings.mqtt.v0._2_0.message; + +import com.asyncapi.schemas.serde.ReferenceOrAsyncAPISchemaOrStringDeserializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes MQTT message binding. + *

+ * Contains information about the message representation in MQTT. + * + * @see MQTT message binding + * @see MQTT + * @version 0.2.0 + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class MQTTMessageBinding extends com.asyncapi.bindings.mqtt.MQTTMessageBinding { + + /** + * 1 indicates that the payload is UTF-8 encoded character data. + *

+ * 0 indicates that the payload format is unspecified. + */ + @Nullable + @Builder.Default + private Integer payloadFormatIndicator = 0; + + /** + * Correlation Data is used by the sender of the request message to identify which request the response message is for when it is received. + *

+ * MUST BE: + *

    + *
  • {@link com.asyncapi.schemas.asyncapi.AsyncAPISchema}
    • + *
  • {@link com.asyncapi.schemas.asyncapi.Reference}
    • + *
+ */ + @Nullable + @JsonDeserialize(using = ReferenceOrAsyncAPISchemaOrStringDeserializer.class) + private Object correlationData; + + /** + * String describing the content type of the message payload. + *

+ * This should not conflict with the contentType field of the associated AsyncAPI Message object. + */ + @Nullable + private String contentType; + + /** + * The topic (channel URI) to be used for a response message. + *

+ * MUST BE: + *

    + *
  • {@link String} in uri-template format
    • + *
  • {@link com.asyncapi.schemas.asyncapi.AsyncAPISchema}
    • + *
  • {@link com.asyncapi.schemas.asyncapi.Reference}
    • + *
+ */ + @Nullable + @JsonDeserialize(using = ReferenceOrAsyncAPISchemaOrStringDeserializer.class) + private Object responseTopic; + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java new file mode 100644 index 00000000..31607851 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java @@ -0,0 +1,83 @@ +package com.asyncapi.bindings.mqtt.v0._2_0.operation; + +import com.asyncapi.schemas.serde.ReferenceOrAsyncAPISchemaOrNumberDeserializer; +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes MQTT operation binding. + *

+ * Contains information about the operation representation in MQTT. + * + * @see MQTT operation binding + * @see MQTT + * @version 0.2.0 + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes MQTT operation binding.") +public class MQTTOperationBinding extends com.asyncapi.bindings.mqtt.MQTTOperationBinding { + + /** + * Defines how hard the broker/client will try to ensure that a message is received. + * Its value MUST be either 0, 1 or 2. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @javax.validation.constraints.Min( + value = 0, + message = "QoS must be greater or equals to 0." + ) + @javax.validation.constraints.Max( + value = 2, + message = "QoS must be lower or equals to 2." + ) + @JsonProperty("qos") + @JsonPropertyDescription("Defines the Quality of Service (QoS) levels for the message flow between client and server. Its value MUST be either 0 (At most once delivery), 1 (At least once delivery), or 2 (Exactly once delivery).") + private Integer qos; + + /** + * Whether the broker should retain the message or not. + *

+ * Applies to: publish, subscribe + */ + @Nullable + @JsonProperty("retain") + @JsonPropertyDescription("Whether the broker should retain the message or not.") + private Boolean retain; + + /** + * Lifetime of the message in seconds. + *

+ * MUST BE: + *

    + *
  • {@link Number}
    • + *
  • {@link com.asyncapi.schemas.asyncapi.Reference}
    • + *
  • {@link com.asyncapi.schemas.asyncapi.AsyncAPISchema}
    • + *
+ */ + @Nullable + @JsonDeserialize(using = ReferenceOrAsyncAPISchemaOrNumberDeserializer.class) + private Object messageExpiryInterval; + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java new file mode 100644 index 00000000..edc17ed1 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java @@ -0,0 +1,102 @@ +package com.asyncapi.bindings.mqtt.v0._2_0.server; + +import com.asyncapi.schemas.serde.ReferenceOrAsyncAPISchemaOrNumberDeserializer; +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes MQTT server binding. + *

+ * Contains information about the server representation in MQTT. + * + * @see MQTT server binding + * @see MQTT + * @version 0.2.0 + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes MQTT server binding.") +public class MQTTServerBinding extends com.asyncapi.bindings.mqtt.MQTTServerBinding { + + /** + * The client identifier. + */ + @Nullable + @JsonProperty("clientId") + @JsonPropertyDescription("The client identifier.") + private String clientId; + + /** + * Whether to create a persisten connection or not. When false, the connection will be persistent. + */ + @Nullable + @JsonProperty("cleanSession") + @JsonPropertyDescription("Whether to create a persisten connection or not. When false, the connection will be persistent.") + private Boolean cleanSession; + + /** + * Last Will and Testament configuration. + */ + @Nullable + @JsonProperty("lastWill") + @JsonPropertyDescription("Last Will and Testament configuration.") + private MQTTServerLastWillConfiguration lastWill; + + /** + * Interval in seconds of the longest period of time the broker and the client can endure without sending a message. + */ + @Nullable + @JsonProperty("keepAlive") + @JsonPropertyDescription("Interval in seconds of the longest period of time the broker and the client can endure without sending a message.") + private Integer keepAlive; + + /** + * Interval time in seconds or a Schema Object containing the definition of the interval. + *

+ * The broker maintains a session for a disconnected client until this interval expires. + *

+ * MUST BE: + *

    + *
  • {@link Number}
    • + *
  • {@link com.asyncapi.schemas.asyncapi.Reference}
    • + *
  • {@link com.asyncapi.schemas.asyncapi.AsyncAPISchema}
    • + *
+ */ + @Nullable + @JsonDeserialize(using = ReferenceOrAsyncAPISchemaOrNumberDeserializer.class) + private Object sessionExpiryInterval; + + /** + * Number of bytes or a Schema Object representing the Maximum Packet Size the Client is willing to accept. + *

+ * MUST BE: + *

    + *
  • {@link Number}
    • + *
  • {@link com.asyncapi.schemas.asyncapi.Reference}
    • + *
  • {@link com.asyncapi.schemas.asyncapi.AsyncAPISchema}
    • + *
+ */ + @Nullable + @JsonDeserialize(using = ReferenceOrAsyncAPISchemaOrNumberDeserializer.class) + private Object maximumPacketSize; + + @Override + public String getBindingVersion() { + return "0.2.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.2.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerLastWillConfiguration.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerLastWillConfiguration.java new file mode 100644 index 00000000..663a226d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerLastWillConfiguration.java @@ -0,0 +1,67 @@ +package com.asyncapi.bindings.mqtt.v0._2_0.server; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * Describes MQTT server last will configuration. + * + * @see MQTT server binding + * @see MQTT + * @version 0.2.0 + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +@Data +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class MQTTServerLastWillConfiguration { + + /** + * The topic where the Last Will and Testament message will be sent. + */ + @Nullable + @JsonProperty("topic") + @JsonPropertyDescription("The topic where the Last Will and Testament message will be sent.") + private String topic; + + /** + * Defines how hard the broker/client will try to ensure that the Last Will and Testament message is received. + * Its value MUST be either 0, 1 or 2. + */ + @Nullable + @javax.validation.constraints.Min( + value = 0, + message = "QoS must be greater or equals to 0." + ) + @javax.validation.constraints.Max( + value = 2, + message = "QoS must be lower or equals to 0." + ) + @JsonProperty("qos") + @JsonPropertyDescription("Defines how hard the broker/client will try to ensure that the Last Will and Testament message is received. Its value MUST be either 0, 1 or 2.") + private Integer qos; + + /** + * Last Will message. + */ + @Nullable + @JsonProperty("message") + @JsonPropertyDescription("Last Will message.") + private String message; + + /** + * Whether the broker should retain the Last Will and Testament message or not. + */ + @Nullable + @JsonProperty("retain") + @JsonPropertyDescription("Whether the broker should retain the Last Will and Testament message or not.") + private Boolean retain; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java new file mode 100644 index 00000000..da44fc8b --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java @@ -0,0 +1,42 @@ +package com.asyncapi.schemas.serde; + +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.fasterxml.jackson.core.JacksonException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.IOException; + +public class ReferenceOrAsyncAPISchemaOrNumberDeserializer extends JsonDeserializer { + + @Override + public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException { + ObjectCodec objectCodec = p.getCodec(); + JsonNode node = objectCodec.readTree(p); + + JsonNode jsonNode = node.get("$ref"); + Object parsedNode; + try (JsonParser jsonParser = node.traverse(objectCodec)) { + if (node.isNumber()) { + parsedNode = jsonParser.readValueAs(Number.class); + } else if (isReference(jsonNode)) { + parsedNode = jsonParser.readValueAs(Reference.class); + } else { + parsedNode = jsonParser.readValueAs(AsyncAPISchema.class); + } + } + + return parsedNode; + } + + private boolean isReference(@Nullable JsonNode jsonNode) { + return jsonNode != null && jsonNode.properties().size() == 1 && jsonNode.get("$ref") != null; + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrStringDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrStringDeserializer.java new file mode 100644 index 00000000..7cdd01ab --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrStringDeserializer.java @@ -0,0 +1,42 @@ +package com.asyncapi.schemas.serde; + +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; +import com.fasterxml.jackson.core.JacksonException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.IOException; + +public class ReferenceOrAsyncAPISchemaOrStringDeserializer extends JsonDeserializer { + + @Override + public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException { + ObjectCodec objectCodec = p.getCodec(); + JsonNode node = objectCodec.readTree(p); + + JsonNode jsonNode = node.get("$ref"); + Object parsedNode; + try (JsonParser jsonParser = node.traverse(objectCodec)) { + if (node.isTextual()) { + parsedNode = node.asText(); + } else if (isReference(jsonNode)) { + parsedNode = jsonParser.readValueAs(Reference.class); + } else { + parsedNode = jsonParser.readValueAs(AsyncAPISchema.class); + } + } + + return parsedNode; + } + + private boolean isReference(@Nullable JsonNode jsonNode) { + return jsonNode != null && jsonNode.properties().size() == 1 && jsonNode.get("$ref") != null; + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTLatestTest.java index a31600b4..9509b193 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTLatestTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTLatestTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.mqtt; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.channel.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.message.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.operation.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.server.MQTTServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,7 +14,7 @@ public class MQTTLatestTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = MQTTV0_1_0Test.channelBinding(); + super.binding = MQTTV0_2_0Test.channelBinding(); super.bindingTypeClass = MQTTChannelBinding.class; super.pathToBindingJson = "/bindings/mqtt/latest/channel/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/latest/channel/binding - extended.json"; @@ -24,7 +24,7 @@ class ChannelTest extends BindingTest {{ @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = MQTTV0_1_0Test.messageBinding(); + super.binding = MQTTV0_2_0Test.messageBinding(); super.bindingTypeClass = MQTTMessageBinding.class; super.pathToBindingJson = "/bindings/mqtt/latest/message/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/latest/message/binding - extended.json"; @@ -34,7 +34,7 @@ class Message extends BindingTest {{ @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = MQTTV0_1_0Test.operationBinding(); + super.binding = MQTTV0_2_0Test.operationBinding(); super.bindingTypeClass = MQTTOperationBinding.class; super.pathToBindingJson = "/bindings/mqtt/latest/operation/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/latest/operation/binding - extended.json"; @@ -44,7 +44,7 @@ class Operation extends BindingTest {{ @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = MQTTV0_1_0Test.serverBinding(); + super.binding = MQTTV0_2_0Test.serverBinding(); super.bindingTypeClass = MQTTServerBinding.class; super.pathToBindingJson = "/bindings/mqtt/latest/server/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/latest/server/binding - extended.json"; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTUnknownVersionTest.java index 3cfe19f3..568a8c65 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTUnknownVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTUnknownVersionTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.mqtt; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.channel.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.message.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.operation.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.server.MQTTServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,7 +14,7 @@ public class MQTTUnknownVersionTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = MQTTV0_1_0Test.channelBinding(); + super.binding = MQTTV0_2_0Test.channelBinding(); super.bindingTypeClass = MQTTChannelBinding.class; super.pathToBindingJson = "/bindings/mqtt/unknown version/channel/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/unknown version/channel/binding - extended.json"; @@ -24,7 +24,7 @@ class ChannelTest extends BindingTest {{ @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = MQTTV0_1_0Test.messageBinding(); + super.binding = MQTTV0_2_0Test.messageBinding(); super.bindingTypeClass = MQTTMessageBinding.class; super.pathToBindingJson = "/bindings/mqtt/unknown version/message/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/unknown version/message/binding - extended.json"; @@ -34,7 +34,7 @@ class Message extends BindingTest {{ @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = MQTTV0_1_0Test.operationBinding(); + super.binding = MQTTV0_2_0Test.operationBinding(); super.bindingTypeClass = MQTTOperationBinding.class; super.pathToBindingJson = "/bindings/mqtt/unknown version/operation/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/unknown version/operation/binding - extended.json"; @@ -44,7 +44,7 @@ class Operation extends BindingTest {{ @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = MQTTV0_1_0Test.serverBinding(); + super.binding = MQTTV0_2_0Test.serverBinding(); super.bindingTypeClass = MQTTServerBinding.class; super.pathToBindingJson = "/bindings/mqtt/unknown version/server/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/unknown version/server/binding - extended.json"; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTV0_2_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTV0_2_0Test.java new file mode 100644 index 00000000..ac59a2cc --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTV0_2_0Test.java @@ -0,0 +1,96 @@ +package com.asyncapi.bindings.mqtt; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.mqtt.v0._2_0.channel.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.message.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.operation.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.server.MQTTServerBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.server.MQTTServerLastWillConfiguration; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +@DisplayName("0.2.0") +public class MQTTV0_2_0Test { + + public static MQTTChannelBinding channelBinding () { + return new MQTTChannelBinding(); + } + + public static MQTTMessageBinding messageBinding () { + return MQTTMessageBinding.builder() + .contentType("application/json") + .correlationData(AsyncAPISchema.builder() + .type("string") + .format("uuid") + .build() + ) + .responseTopic("application/responses") + .build(); + } + + public static MQTTOperationBinding operationBinding () { + return MQTTOperationBinding.builder() + .qos(2) + .retain(true) + .messageExpiryInterval(60) + .build(); + } + + public static MQTTServerBinding serverBinding () { + return MQTTServerBinding.builder() + .clientId("guest") + .cleanSession(true) + .lastWill(new MQTTServerLastWillConfiguration( + "/last-wills", + 2, + "Guest gone offline.", + false + )) + .keepAlive(60) + .sessionExpiryInterval(120) + .maximumPacketSize(1024) + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = MQTTChannelBinding.class; + super.pathToBindingJson = "/bindings/mqtt/0.2.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/0.2.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/0.2.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = MQTTMessageBinding.class; + super.pathToBindingJson = "/bindings/mqtt/0.2.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/0.2.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/0.2.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = MQTTOperationBinding.class; + super.pathToBindingJson = "/bindings/mqtt/0.2.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/0.2.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/0.2.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = MQTTServerBinding.class; + super.pathToBindingJson = "/bindings/mqtt/0.2.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/mqtt/0.2.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/mqtt/0.2.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTWithoutVersionTest.java index 5380ec30..5decdc8f 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTWithoutVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/mqtt/MQTTWithoutVersionTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.mqtt; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.message.MQTTMessageBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding; -import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.channel.MQTTChannelBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.message.MQTTMessageBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.operation.MQTTOperationBinding; +import com.asyncapi.bindings.mqtt.v0._2_0.server.MQTTServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,7 +14,7 @@ public class MQTTWithoutVersionTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = MQTTV0_1_0Test.channelBinding(); + super.binding = MQTTV0_2_0Test.channelBinding(); super.bindingTypeClass = MQTTChannelBinding.class; super.pathToBindingJson = "/bindings/mqtt/without version/channel/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/without version/channel/binding - extended.json"; @@ -24,7 +24,7 @@ class ChannelTest extends BindingTest {{ @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = MQTTV0_1_0Test.messageBinding(); + super.binding = MQTTV0_2_0Test.messageBinding(); super.bindingTypeClass = MQTTMessageBinding.class; super.pathToBindingJson = "/bindings/mqtt/without version/message/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/without version/message/binding - extended.json"; @@ -34,7 +34,7 @@ class Message extends BindingTest {{ @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = MQTTV0_1_0Test.operationBinding(); + super.binding = MQTTV0_2_0Test.operationBinding(); super.bindingTypeClass = MQTTOperationBinding.class; super.pathToBindingJson = "/bindings/mqtt/without version/operation/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/without version/operation/binding - extended.json"; @@ -44,7 +44,7 @@ class Operation extends BindingTest {{ @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = MQTTV0_1_0Test.serverBinding(); + super.binding = MQTTV0_2_0Test.serverBinding(); super.bindingTypeClass = MQTTServerBinding.class; super.pathToBindingJson = "/bindings/mqtt/without version/server/binding.json"; super.pathToExtendedBindingJson = "/bindings/mqtt/without version/server/binding - extended.json"; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt index 69e52534..38131cf1 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsMQTT.kt @@ -12,7 +12,7 @@ import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server import com.asyncapi.v2._0_0.model.server.ServerVariable -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding +import com.asyncapi.bindings.mqtt.v0._2_0.operation.MQTTOperationBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.security.v2.ApiKeySecurityScheme import com.asyncapi.schemas.asyncapi.security.v2.OpenIdConnectSecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt index 97b1c6ae..1aa9230e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsMQTT.kt @@ -13,7 +13,7 @@ import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server import com.asyncapi.v2._6_0.model.server.ServerVariable -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding +import com.asyncapi.bindings.mqtt.v0._2_0.operation.MQTTOperationBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.security.v2.ApiKeySecurityScheme import com.asyncapi.schemas.asyncapi.security.v2.OpenIdConnectSecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt index 3d31fb9e..18275012 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsMQTTAsyncAPI.kt @@ -16,7 +16,7 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server import com.asyncapi.v3._0_0.model.server.ServerVariable -import com.asyncapi.bindings.mqtt.v0._1_0.operation.MQTTOperationBinding +import com.asyncapi.bindings.mqtt.v0._2_0.operation.MQTTOperationBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuth2SecurityScheme import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuthFlows diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index a7b38642..f20840e9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -14,7 +14,7 @@ import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding import com.asyncapi.bindings.kafka.KafkaV0_4_0Test import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding -import com.asyncapi.bindings.mqtt.v0._1_0.channel.MQTTChannelBinding +import com.asyncapi.bindings.mqtt.v0._2_0.channel.MQTTChannelBinding import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding import com.asyncapi.bindings.nats.v0._1_0.channel.NATSChannelBinding import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding - extended.json new file mode 100644 index 00000000..3e09b93f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..1cb38f9c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding.json new file mode 100644 index 00000000..a22565a8 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding - extended.json new file mode 100644 index 00000000..b82f2be1 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding - extended.json @@ -0,0 +1,15 @@ +{ + "payloadFormatIndicator" : 0, + "correlationData" : { + "type" : "string", + "format" : "uuid" + }, + "contentType" : "application/json", + "responseTopic" : "application/responses", + "bindingVersion" : "0.2.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..81b6e51b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding - wrongly extended.json @@ -0,0 +1,15 @@ +{ + "contentType": "application/json", + "correlationData": { + "type": "string", + "format": "uuid" + }, + "responseTopic": "application/responses", + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding.json new file mode 100644 index 00000000..03f4a649 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/message/binding.json @@ -0,0 +1,9 @@ +{ + "contentType": "application/json", + "correlationData": { + "type": "string", + "format": "uuid" + }, + "responseTopic": "application/responses", + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding - extended.json new file mode 100644 index 00000000..b940de4b --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding - extended.json @@ -0,0 +1,11 @@ +{ + "messageExpiryInterval" : 60, + "bindingVersion" : "0.2.0", + "qos" : 2, + "retain" : true, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..51e726da --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding - wrongly extended.json @@ -0,0 +1,12 @@ +{ + "qos": 2, + "retain": true, + "messageExpiryInterval": 60, + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding.json new file mode 100644 index 00000000..b4bcfd0c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/operation/binding.json @@ -0,0 +1,6 @@ +{ + "qos": 2, + "retain": true, + "messageExpiryInterval": 60, + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding - extended.json new file mode 100644 index 00000000..176d3174 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding - extended.json @@ -0,0 +1,19 @@ +{ + "sessionExpiryInterval" : 120, + "maximumPacketSize" : 1024, + "bindingVersion" : "0.2.0", + "clientId" : "guest", + "cleanSession" : true, + "lastWill" : { + "topic" : "/last-wills", + "qos" : 2, + "message" : "Guest gone offline.", + "retain" : false + }, + "keepAlive" : 60, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..99263aad --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding - wrongly extended.json @@ -0,0 +1,20 @@ +{ + "clientId": "guest", + "cleanSession": true, + "lastWill": { + "topic": "/last-wills", + "qos": 2, + "message": "Guest gone offline.", + "retain": false + }, + "keepAlive": 60, + "sessionExpiryInterval": 120, + "maximumPacketSize": 1024, + "bindingVersion": "0.2.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding.json new file mode 100644 index 00000000..4c03de90 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/mqtt/0.2.0/server/binding.json @@ -0,0 +1,14 @@ +{ + "clientId": "guest", + "cleanSession": true, + "lastWill": { + "topic": "/last-wills", + "qos": 2, + "message": "Guest gone offline.", + "retain": false + }, + "keepAlive": 60, + "sessionExpiryInterval": 120, + "maximumPacketSize": 1024, + "bindingVersion": "0.2.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - extended.json index 32459b79..3e09b93f 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/channel/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.2.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - extended.json index 32459b79..b82f2be1 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - extended.json @@ -1,5 +1,12 @@ { - "bindingVersion" : "0.1.0", + "payloadFormatIndicator" : 0, + "correlationData" : { + "type" : "string", + "format" : "uuid" + }, + "contentType" : "application/json", + "responseTopic" : "application/responses", + "bindingVersion" : "0.2.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - wrongly extended.json index 18560ee8..9aee321f 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding - wrongly extended.json @@ -1,4 +1,10 @@ { + "contentType": "application/json", + "correlationData": { + "type": "string", + "format": "uuid" + }, + "responseTopic": "application/responses", "bindingVersion": "latest", "x-number": 0, "x-string": "", diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding.json index cdf165f6..6b81fb94 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/message/binding.json @@ -1,3 +1,9 @@ { + "contentType": "application/json", + "correlationData": { + "type": "string", + "format": "uuid" + }, + "responseTopic": "application/responses", "bindingVersion": "latest" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - extended.json index 8a8a7501..b940de4b 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - extended.json @@ -1,5 +1,6 @@ { - "bindingVersion" : "0.1.0", + "messageExpiryInterval" : 60, + "bindingVersion" : "0.2.0", "qos" : 2, "retain" : true, "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - wrongly extended.json index 6f223dab..d6bbb3a4 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding - wrongly extended.json @@ -1,6 +1,7 @@ { "qos": 2, "retain": true, + "messageExpiryInterval": 60, "bindingVersion": "latest", "x-number": 0, "x-string": "", diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding.json index 8ac6a05e..54e74dae 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/operation/binding.json @@ -1,5 +1,6 @@ { "qos": 2, "retain": true, + "messageExpiryInterval": 60, "bindingVersion": "latest" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - extended.json index 88e46702..176d3174 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - extended.json @@ -1,5 +1,7 @@ { - "bindingVersion" : "0.1.0", + "sessionExpiryInterval" : 120, + "maximumPacketSize" : 1024, + "bindingVersion" : "0.2.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - wrongly extended.json index 65fd55b9..7cdf0c33 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding - wrongly extended.json @@ -8,6 +8,8 @@ "retain": false }, "keepAlive": 60, + "sessionExpiryInterval": 120, + "maximumPacketSize": 1024, "bindingVersion": "latest", "x-number": 0, "x-string": "", diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding.json index 649bcbdb..25242719 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/latest/server/binding.json @@ -8,5 +8,7 @@ "retain": false }, "keepAlive": 60, + "sessionExpiryInterval": 120, + "maximumPacketSize": 1024, "bindingVersion": "latest" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - extended.json index 32459b79..3e09b93f 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/channel/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.2.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - extended.json index 32459b79..b82f2be1 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - extended.json @@ -1,5 +1,12 @@ { - "bindingVersion" : "0.1.0", + "payloadFormatIndicator" : 0, + "correlationData" : { + "type" : "string", + "format" : "uuid" + }, + "contentType" : "application/json", + "responseTopic" : "application/responses", + "bindingVersion" : "0.2.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - wrongly extended.json index 0dee3264..47a4dfcd 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding - wrongly extended.json @@ -1,5 +1,11 @@ { "bindingVersion": "unknown version", + "contentType": "application/json", + "correlationData": { + "type": "string", + "format": "uuid" + }, + "responseTopic": "application/responses", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding.json index defc96bf..e5b3f348 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/message/binding.json @@ -1,3 +1,9 @@ { + "contentType": "application/json", + "correlationData": { + "type": "string", + "format": "uuid" + }, + "responseTopic": "application/responses", "bindingVersion": "unknown version" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - extended.json index 8a8a7501..b940de4b 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - extended.json @@ -1,5 +1,6 @@ { - "bindingVersion" : "0.1.0", + "messageExpiryInterval" : 60, + "bindingVersion" : "0.2.0", "qos" : 2, "retain" : true, "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - wrongly extended.json index 19ac921d..308c6faa 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding - wrongly extended.json @@ -1,6 +1,7 @@ { "qos": 2, "retain": true, + "messageExpiryInterval": 60, "bindingVersion": "unknown version", "x-number": 0, "x-string": "", diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding.json index d3a8acdb..8da498b6 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/operation/binding.json @@ -1,5 +1,6 @@ { "qos": 2, "retain": true, + "messageExpiryInterval": 60, "bindingVersion": "unknown version" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - extended.json index 88e46702..176d3174 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - extended.json @@ -1,5 +1,7 @@ { - "bindingVersion" : "0.1.0", + "sessionExpiryInterval" : 120, + "maximumPacketSize" : 1024, + "bindingVersion" : "0.2.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - wrongly extended.json index f2816b4c..3aa0af75 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding - wrongly extended.json @@ -8,6 +8,8 @@ "retain": false }, "keepAlive": 60, + "sessionExpiryInterval": 120, + "maximumPacketSize": 1024, "bindingVersion": "unknown version", "x-number": 0, "x-string": "", diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding.json index 1668214d..907a5a54 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/unknown version/server/binding.json @@ -8,5 +8,7 @@ "retain": false }, "keepAlive": 60, + "sessionExpiryInterval": 120, + "maximumPacketSize": 1024, "bindingVersion": "unknown version" } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - extended.json index 32459b79..3e09b93f 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/channel/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.1.0", + "bindingVersion" : "0.2.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - extended.json index 32459b79..b82f2be1 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - extended.json @@ -1,5 +1,12 @@ { - "bindingVersion" : "0.1.0", + "payloadFormatIndicator" : 0, + "correlationData" : { + "type" : "string", + "format" : "uuid" + }, + "contentType" : "application/json", + "responseTopic" : "application/responses", + "bindingVersion" : "0.2.0", "x-number" : 0, "x-string" : "", "x-object" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json index a16bbdf8..cd828051 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding - wrongly extended.json @@ -1,4 +1,10 @@ { + "contentType": "application/json", + "correlationData": { + "type": "string", + "format": "uuid" + }, + "responseTopic": "application/responses", "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json index 9e26dfee..54cee00c 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/message/binding.json @@ -1 +1,8 @@ -{} \ No newline at end of file +{ + "contentType": "application/json", + "correlationData": { + "type": "string", + "format": "uuid" + }, + "responseTopic": "application/responses" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - extended.json index 8a8a7501..b940de4b 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - extended.json @@ -1,5 +1,6 @@ { - "bindingVersion" : "0.1.0", + "messageExpiryInterval" : 60, + "bindingVersion" : "0.2.0", "qos" : 2, "retain" : true, "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json index b2185d3f..eec27a92 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding - wrongly extended.json @@ -1,6 +1,7 @@ { "qos": 2, "retain": true, + "messageExpiryInterval": 60, "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json index 7aed757d..7b20475a 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/operation/binding.json @@ -1,4 +1,5 @@ { "qos": 2, - "retain": true + "retain": true, + "messageExpiryInterval": 60 } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - extended.json index 88e46702..176d3174 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - extended.json @@ -1,5 +1,7 @@ { - "bindingVersion" : "0.1.0", + "sessionExpiryInterval" : 120, + "maximumPacketSize" : 1024, + "bindingVersion" : "0.2.0", "clientId" : "guest", "cleanSession" : true, "lastWill" : { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json index 25917eec..0b87223e 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding - wrongly extended.json @@ -8,6 +8,8 @@ "retain": false }, "keepAlive": 60, + "sessionExpiryInterval": 120, + "maximumPacketSize": 1024, "x-number": 0, "x-string": "", "x-object": { diff --git a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json index 75f11bd1..e96027dd 100644 --- a/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json +++ b/asyncapi-core/src/test/resources/bindings/mqtt/without version/server/binding.json @@ -7,5 +7,7 @@ "message": "Guest gone offline.", "retain": false }, - "keepAlive": 60 + "keepAlive": 60, + "sessionExpiryInterval": 120, + "maximumPacketSize": 1024 } \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 5c067cfa..1b64732d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -1065,7 +1065,7 @@ "bindingVersion" : "0.1.0" }, "mqtt" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "mqtt5" : { "bindingVersion" : "0.2.0" @@ -1936,7 +1936,7 @@ "bindingVersion" : "0.1.0" }, "mqtt" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "mqtt5" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index b37d441b..e617f01d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -947,7 +947,7 @@ "bindingVersion" : "0.1.0" }, "mqtt" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "mqtt5" : { "bindingVersion" : "0.2.0" diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index bce56e46..c63c086b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -763,7 +763,7 @@ "bindingVersion" : "0.1.0" }, "mqtt" : { - "bindingVersion" : "0.1.0" + "bindingVersion" : "0.2.0" }, "mqtt5" : { "bindingVersion" : "0.2.0" From ec5ed6b18cadc035e8e99ebde1e48fbbd12e1f03 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 13 May 2024 02:48:20 +0400 Subject: [PATCH 104/141] docs(bindings): MQTT 0.1.0 --- .../bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java | 4 +++- .../bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java | 4 +++- .../bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java | 4 +++- .../bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java | 4 +++- .../mqtt/v0/_1_0/server/MQTTServerLastWillConfiguration.java | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java index 710704d7..e1480b9e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/channel/MQTTChannelBinding.java @@ -10,9 +10,11 @@ *

* Describes MQTT channel binding. * - * @version 0.1.0 * @see MQTT channel binding + * @see MQTT + * @version 0.1.0 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java index 03b3779a..703ff655 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java @@ -10,9 +10,11 @@ *

* Contains information about the message representation in MQTT. * - * @version 0.1.0 * @see MQTT message binding + * @see MQTT + * @version 0.1.0 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java index 48c1ea90..95cf4982 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the operation representation in MQTT. * - * @version 0.1.0 * @see MQTT operation binding + * @see MQTT + * @version 0.1.0 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java index 2c07dfa8..f7461bde 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the server representation in MQTT. * - * @version 0.1.0 * @see MQTT server binding + * @see MQTT + * @version 0.1.0 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerLastWillConfiguration.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerLastWillConfiguration.java index 72ebf864..65cf84cc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerLastWillConfiguration.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerLastWillConfiguration.java @@ -11,9 +11,11 @@ /** * Describes MQTT server last will configuration. * - * @version 0.1.0 * @see MQTT server binding + * @see MQTT + * @version 0.1.0 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode From 4e912f4f804e298150fec1c0f9f628a6ef292d01 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Mon, 13 May 2024 22:52:57 +0400 Subject: [PATCH 105/141] feat(bindings): Kafka 0.1.0, 0.3.0, 0.5.0 --- .../bindings/kafka/KafkaChannelBinding.java | 12 +- .../bindings/kafka/KafkaMessageBinding.java | 14 +- .../bindings/kafka/KafkaOperationBinding.java | 14 +- .../bindings/kafka/KafkaServerBinding.java | 12 +- .../v0/_1_0/channel/KafkaChannelBinding.java | 34 ++++ .../v0/_1_0/message/KafkaMessageBinding.java | 43 +++++ .../_1_0/operation/KafkaOperationBinding.java | 51 +++++ .../v0/_1_0/server/KafkaServerBinding.java | 32 ++++ .../v0/_3_0/channel/KafkaChannelBinding.java | 72 +++++++ .../v0/_3_0/message/KafkaMessageBinding.java | 67 +++++++ .../message/KafkaMessageSchemaIdLocation.java | 22 +++ .../_3_0/operation/KafkaOperationBinding.java | 51 +++++ .../v0/_3_0/server/KafkaServerBinding.java | 54 ++++++ .../v0/_4_0/message/KafkaMessageBinding.java | 1 + .../v0/_5_0/channel/KafkaChannelBinding.java | 80 ++++++++ .../KafkaChannelTopicCleanupPolicy.java | 21 +++ .../KafkaChannelTopicConfiguration.java | 125 +++++++++++++ .../v0/_5_0/message/KafkaMessageBinding.java | 68 +++++++ .../message/KafkaMessageSchemaIdLocation.java | 22 +++ .../_5_0/operation/KafkaOperationBinding.java | 51 +++++ .../v0/_5_0/server/KafkaServerBinding.java | 54 ++++++ .../bindings/kafka/KafkaLatestTest.java | 16 +- .../kafka/KafkaUnknownVersionTest.java | 16 +- .../bindings/kafka/KafkaV0_1_0Test.java | 88 +++++++++ .../bindings/kafka/KafkaV0_3_0Test.java | 99 ++++++++++ .../bindings/kafka/KafkaV0_5_0Test.java | 112 +++++++++++ .../kafka/KafkaWithoutVersionTest.java | 16 +- .../examples/v2/_0_0/StreetlightsKafka.kt | 2 +- .../v2/_0_0/StreetlightsOperationSecurity.kt | 2 +- .../examples/v2/_6_0/StreetlightsKafka.kt | 2 +- .../v2/_6_0/StreetlightsOperationSecurity.kt | 2 +- .../v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt | 10 +- .../v3/_0_0/StreetlightsKafkaAsyncAPI.kt | 2 +- .../StreetlightsOperationSecurityAsyncAPI.kt | 2 +- .../v2/_0_0/model/channel/ChannelItemTest.kt | 4 +- .../_0_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_0_0/model/server/ServerTest.kt | 2 +- .../v2/_6_0/model/channel/ChannelItemTest.kt | 4 +- .../_6_0/model/channel/message/MessageTest.kt | 4 +- .../model/channel/message/MessageTraitTest.kt | 4 +- .../model/channel/operation/OperationTest.kt | 4 +- .../channel/operation/OperationTraitTest.kt | 4 +- .../v2/_6_0/model/server/ServerTest.kt | 2 +- .../v3/_0_0/model/channel/ChannelTest.kt | 6 +- .../_0_0/model/channel/message/MessageTest.kt | 8 +- .../model/channel/message/MessageTraitTest.kt | 8 +- .../v3/_0_0/model/operation/OperationTest.kt | 6 +- .../model/operation/OperationTraitTest.kt | 6 +- .../v3/_0_0/model/server/ServerTest.kt | 2 +- .../0.1.0/channel/binding - extended.json | 8 + .../channel/binding - wrongly extended.json | 9 + .../bindings/kafka/0.1.0/channel/binding.json | 3 + .../0.1.0/message/binding - extended.json | 12 ++ .../message/binding - wrongly extended.json | 15 ++ .../bindings/kafka/0.1.0/message/binding.json | 9 + .../0.1.0/operation/binding - extended.json | 16 ++ .../operation/binding - wrongly extended.json | 21 +++ .../kafka/0.1.0/operation/binding.json | 15 ++ .../0.1.0/server/binding - extended.json | 8 + .../server/binding - wrongly extended.json | 9 + .../bindings/kafka/0.1.0/server/binding.json | 3 + .../0.3.0/channel/binding - extended.json | 11 ++ .../channel/binding - wrongly extended.json | 12 ++ .../bindings/kafka/0.3.0/channel/binding.json | 6 + .../0.3.0/message/binding - extended.json | 15 ++ .../message/binding - wrongly extended.json | 18 ++ .../bindings/kafka/0.3.0/message/binding.json | 12 ++ .../0.3.0/operation/binding - extended.json | 16 ++ .../operation/binding - wrongly extended.json | 21 +++ .../kafka/0.3.0/operation/binding.json | 15 ++ .../0.3.0/server/binding - extended.json | 10 + .../server/binding - wrongly extended.json | 11 ++ .../bindings/kafka/0.3.0/server/binding.json | 5 + .../0.5.0/channel/binding - extended.json | 18 ++ .../channel/binding - wrongly extended.json | 22 +++ .../bindings/kafka/0.5.0/channel/binding.json | 16 ++ .../0.5.0/message/binding - extended.json | 15 ++ .../message/binding - wrongly extended.json | 18 ++ .../bindings/kafka/0.5.0/message/binding.json | 12 ++ .../0.5.0/operation/binding - extended.json | 16 ++ .../operation/binding - wrongly extended.json | 21 +++ .../kafka/0.5.0/operation/binding.json | 15 ++ .../0.5.0/server/binding - extended.json | 10 + .../server/binding - wrongly extended.json | 11 ++ .../bindings/kafka/0.5.0/server/binding.json | 5 + .../latest/channel/binding - extended.json | 2 +- .../latest/message/binding - extended.json | 2 +- .../latest/operation/binding - extended.json | 2 +- .../latest/server/binding - extended.json | 2 +- .../channel/binding - extended.json | 2 +- .../message/binding - extended.json | 2 +- .../operation/binding - extended.json | 2 +- .../server/binding - extended.json | 2 +- .../channel/binding - extended.json | 2 +- .../message/binding - extended.json | 2 +- .../operation/binding - extended.json | 2 +- .../server/binding - extended.json | 2 +- .../v2/2.0.0/model/asyncapi - extended.json | 28 +-- .../model/asyncapi - wrongly extended.json | 22 +-- .../json/v2/2.0.0/model/asyncapi.json | 28 +-- .../model/channel/channelItem - extended.json | 12 +- .../channelItem - wrongly extended.json | 8 +- .../v2/2.0.0/model/channel/channelItem.json | 12 +- .../channel/message/message - extended.json | 2 +- .../message/message - wrongly extended.json | 2 +- .../2.0.0/model/channel/message/message.json | 2 +- .../message/messageTrait - extended.json | 2 +- .../messageTrait - wrongly extended.json | 2 +- .../model/channel/message/messageTrait.json | 2 +- .../operation with message - extended.json | 6 +- ...ation with message - wrongly extended.json | 4 +- .../operation/operation with message.json | 6 +- ... with reference to message - extended.json | 4 +- ...ference to message - wrongly extended.json | 4 +- .../operation with reference to message.json | 4 +- .../operation/operationTrait - extended.json | 2 +- .../operationTrait - wrongly extended.json | 2 +- .../channel/operation/operationTrait.json | 2 +- .../components/components - extended.json | 14 +- .../components - wrongly extended.json | 12 +- .../v2/2.0.0/model/components/components.json | 14 +- .../2.0.0/model/server/server - extended.json | 2 +- .../server/server - wrongly extended.json | 2 +- .../json/v2/2.0.0/model/server/server.json | 2 +- .../v2/2.6.0/model/asyncapi - extended.json | 46 ++--- .../model/asyncapi - wrongly extended.json | 46 ++--- .../json/v2/2.6.0/model/asyncapi.json | 46 ++--- .../model/channel/channelItem - extended.json | 14 +- .../channelItem - wrongly extended.json | 14 +- .../v2/2.6.0/model/channel/channelItem.json | 14 +- .../channel/message/message - extended.json | 2 +- .../message/message - wrongly extended.json | 2 +- .../2.6.0/model/channel/message/message.json | 2 +- .../message/messageTrait - extended.json | 2 +- .../messageTrait - wrongly extended.json | 2 +- .../model/channel/message/messageTrait.json | 2 +- ...messageWithArrayPayloadArrayOfSchemas.json | 2 +- .../messageWithArrayPayloadJsonSchema.json | 2 +- .../model/channel/message/oneOfMessages.json | 2 +- .../operation with message - extended.json | 6 +- ...ation with message - wrongly extended.json | 6 +- .../operation/operation with message.json | 6 +- ...eration with oneOf message - extended.json | 6 +- ...with oneOf message - wrongly extended.json | 6 +- .../operation with oneOf message.json | 6 +- ... with reference to message - extended.json | 4 +- ...ference to message - wrongly extended.json | 4 +- .../operation with reference to message.json | 4 +- .../operation/operationTrait - extended.json | 2 +- .../operationTrait - wrongly extended.json | 2 +- .../channel/operation/operationTrait.json | 2 +- .../components/components - extended.json | 30 +-- .../components - wrongly extended.json | 30 +-- .../v2/2.6.0/model/components/components.json | 30 +-- .../2.6.0/model/server/server - extended.json | 2 +- .../server/server - wrongly extended.json | 2 +- .../json/v2/2.6.0/model/server/server.json | 2 +- .../v3/3.0.0/model/asyncapi - extended.json | 176 +++++++++--------- .../model/asyncapi - wrongly extended.json | 170 ++++++++--------- .../json/v3/3.0.0/model/asyncapi.json | 176 +++++++++--------- .../model/channel/channel - extended.json | 26 +-- .../channel/channel - wrongly extended.json | 26 +-- .../channel with reference - extended.json | 26 +-- ...nel with reference - wrongly extended.json | 26 +-- .../model/channel/channel with reference.json | 26 +-- .../json/v3/3.0.0/model/channel/channel.json | 26 +-- .../channel/message/message - extended.json | 8 +- .../message/message - wrongly extended.json | 8 +- .../channel/message/message 2 - extended.json | 8 +- .../message/message 2 - wrongly extended.json | 8 +- .../model/channel/message/message 2.json | 8 +- .../message with reference - extended.json | 8 +- ...age with reference - wrongly extended.json | 8 +- .../message/message with reference.json | 8 +- .../3.0.0/model/channel/message/message.json | 8 +- .../message/messageTrait - extended.json | 2 +- .../messageTrait - wrongly extended.json | 2 +- .../message/messageTrait 2 - extended.json | 2 +- .../model/channel/message/messageTrait 2.json | 2 +- ...essageTrait with reference - extended.json | 2 +- ...ait with reference - wrongly extended.json | 2 +- .../message/messageTrait with reference.json | 2 +- .../model/channel/message/messageTrait.json | 2 +- ...messageWithArrayPayloadArrayOfSchemas.json | 2 +- .../messageWithArrayPayloadJsonSchema.json | 2 +- .../components/components - extended.json | 108 +++++------ .../components - wrongly extended.json | 106 +++++------ .../v3/3.0.0/model/components/components.json | 108 +++++------ .../model/operation/operation - extended.json | 6 +- .../operation - wrongly extended.json | 6 +- .../operation with reference - extended.json | 6 +- ...ion with reference - wrongly extended.json | 6 +- .../operation/operation with reference.json | 6 +- .../v3/3.0.0/model/operation/operation.json | 6 +- .../operation/operationTrait - extended.json | 2 +- .../operationTrait - wrongly extended.json | 2 +- ...rationTrait with reference - extended.json | 2 +- ...ait with reference - wrongly extended.json | 2 +- .../operationTrait with reference.json | 2 +- .../3.0.0/model/operation/operationTrait.json | 2 +- .../3.0.0/model/server/server - extended.json | 2 +- .../server/server - wrongly extended.json | 2 +- .../server with reference - extended.json | 2 +- .../model/server/server with reference.json | 2 +- .../json/v3/3.0.0/model/server/server.json | 2 +- 208 files changed, 2575 insertions(+), 957 deletions(-) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/channel/KafkaChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/message/KafkaMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/operation/KafkaOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/server/KafkaServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/channel/KafkaChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageSchemaIdLocation.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/operation/KafkaOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/server/KafkaServerBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelTopicCleanupPolicy.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelTopicConfiguration.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageSchemaIdLocation.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/operation/KafkaOperationBinding.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/server/KafkaServerBinding.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_1_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_3_0Test.java create mode 100644 asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_5_0Test.java create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding - extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding - wrongly extended.json create mode 100644 asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding.json diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java index f9e819ce..b7740ef8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaChannelBinding.java @@ -8,20 +8,24 @@ /** * Describes Kafka channel binding. * - * @version 0.4.0 * @see Kafka channel binding + * @see Kafka * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding.class, + defaultImpl = com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding.class, names = { - "0.4.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._1_0.channel.KafkaChannelBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._3_0.channel.KafkaChannelBinding.class, name = "0.3.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding.class, name = "0.4.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelBinding.class, names = { + "0.5.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java index 4d296199..8b63f12b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaMessageBinding.java @@ -7,23 +7,25 @@ /** * Describes Kafka message binding. - *

- * Contains information about the message representation in Kafka. * - * @version 0.1.0 * @see Kafka message binding + * @see Kafka * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding.class, + defaultImpl = com.asyncapi.bindings.kafka.v0._5_0.message.KafkaMessageBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding.class, names = { - "0.4.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._1_0.message.KafkaMessageBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._3_0.message.KafkaMessageBinding.class, name = "0.3.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding.class, name = "0.4.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._5_0.message.KafkaMessageBinding.class, names = { + "0.5.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java index bc196616..647a65d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaOperationBinding.java @@ -7,23 +7,25 @@ /** * Describes Kafka operation binding. - *

- * Contains information about the operation representation in Kafka. * - * @version 0.1.0 * @see Kafka operation binding + * @see Kafka * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding.class, + defaultImpl = com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding.class, names = { - "0.4.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._1_0.operation.KafkaOperationBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._3_0.operation.KafkaOperationBinding.class, name = "0.3.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding.class, name = "0.4.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding.class, names = { + "0.5.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java index 86cdd075..e5bdac4b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/KafkaServerBinding.java @@ -8,20 +8,24 @@ /** * Describes Kafka server binding. * - * @version 0.4.0 * @see Kafka server binding + * @see Kafka * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, - defaultImpl = com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding.class, + defaultImpl = com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding.class, property = "bindingVersion", visible = true ) @JsonSubTypes({ - @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding.class, names = { - "0.4.0", + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._1_0.server.KafkaServerBinding.class, name = "0.1.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._3_0.server.KafkaServerBinding.class, name = "0.3.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding.class, name = "0.4.0"), + @JsonSubTypes.Type(value = com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding.class, names = { + "0.5.0", "latest" }), }) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/channel/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/channel/KafkaChannelBinding.java new file mode 100644 index 00000000..03ee470c --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/channel/KafkaChannelBinding.java @@ -0,0 +1,34 @@ +package com.asyncapi.bindings.kafka.v0._1_0.channel; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka channel binding. + * + * @see Kafka channel binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes Kafka channel binding.") +public class KafkaChannelBinding extends com.asyncapi.bindings.kafka.KafkaChannelBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/message/KafkaMessageBinding.java new file mode 100644 index 00000000..2fc4d1a8 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/message/KafkaMessageBinding.java @@ -0,0 +1,43 @@ +package com.asyncapi.bindings.kafka.v0._1_0.message; + +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka message binding. + * + * @see Kafka message binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class KafkaMessageBinding extends com.asyncapi.bindings.kafka.KafkaMessageBinding { + + /** + * The message key. + */ + @Nullable + @JsonProperty("key") + @JsonPropertyDescription("The message key.") + private AsyncAPISchema key; + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/operation/KafkaOperationBinding.java new file mode 100644 index 00000000..2844f2c4 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/operation/KafkaOperationBinding.java @@ -0,0 +1,51 @@ +package com.asyncapi.bindings.kafka.v0._1_0.operation; + +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka operation binding. + * + * @see Kafka operation binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class KafkaOperationBinding extends com.asyncapi.bindings.kafka.KafkaOperationBinding { + + /** + * Id of the consumer group. + */ + @Nullable + @JsonProperty("groupId") + @JsonPropertyDescription("Id of the consumer group.") + private AsyncAPISchema groupId; + + /** + * Id of the consumer inside a consumer group. + */ + @Nullable + @JsonProperty("clientId") + @JsonPropertyDescription("Id of the consumer inside a consumer group.") + private AsyncAPISchema clientId; + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/server/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/server/KafkaServerBinding.java new file mode 100644 index 00000000..22935131 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/server/KafkaServerBinding.java @@ -0,0 +1,32 @@ +package com.asyncapi.bindings.kafka.v0._1_0.server; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka server binding. + * + * @see Kafka server binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes Kafka server binding.") +public class KafkaServerBinding extends com.asyncapi.bindings.kafka.KafkaServerBinding { + + @Override + public String getBindingVersion() { + return "0.1.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.1.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/channel/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/channel/KafkaChannelBinding.java new file mode 100644 index 00000000..fc5d367a --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/channel/KafkaChannelBinding.java @@ -0,0 +1,72 @@ +package com.asyncapi.bindings.kafka.v0._3_0.channel; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka channel binding. + * + * @see Kafka channel binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes Kafka channel binding.") +public class KafkaChannelBinding extends com.asyncapi.bindings.kafka.KafkaChannelBinding { + + /** + * Kafka topic name if different from channel name. + */ + @Nullable + @JsonProperty("topic") + @JsonPropertyDescription("Kafka topic name if different from channel name.") + private String topic; + + /** + * Number of partitions configured on this topic (useful to know how many parallel consumers you may run). + *

+ * MUST be positive. + */ + @Nullable + @javax.validation.constraints.Min( + value = 1, + message = "Number of partitions must be greater or equals to 1" + ) + @JsonProperty("partitions") + @JsonPropertyDescription("Number of partitions configured on this topic (useful to know how many parallel consumers you may run).") + private Integer partitions; + + /** + * Number of replicas configured on this topic. + *

+ * MUST be positive. + */ + @Nullable + @javax.validation.constraints.Min( + value = 1, + message = "Number of replicas must be greater or equals to 1" + ) + @JsonProperty("replicas") + @JsonPropertyDescription("Number of replicas configured on this topic.") + private Integer replicas; + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageBinding.java new file mode 100644 index 00000000..6b6cace6 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageBinding.java @@ -0,0 +1,67 @@ +package com.asyncapi.bindings.kafka.v0._3_0.message; + +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka message binding. + * + * @see Kafka message binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class KafkaMessageBinding extends com.asyncapi.bindings.kafka.KafkaMessageBinding { + + /** + * The message key. + */ + @Nullable + @JsonProperty("key") + @JsonPropertyDescription("The message key.") + private AsyncAPISchema key; + + /** + * If a Schema Registry is used when performing this operation, tells where the id of schema is stored (e.g. header or payload). + */ + @Nullable + @JsonProperty("schemaIdLocation") + @JsonPropertyDescription("If a Schema Registry is used when performing this operation, tells where the id of schema is stored (e.g. header or payload).") + private KafkaMessageSchemaIdLocation schemaIdLocation; + + /** + * Number of bytes or vendor specific values when schema id is encoded in payload (e.g confluent/ apicurio-legacy / apicurio-new). + */ + @Nullable + @JsonProperty("schemaIdPayloadEncoding") + @JsonPropertyDescription("Number of bytes or vendor specific values when schema id is encoded in payload (e.g confluent/ apicurio-legacy / apicurio-new).") + private String schemaIdPayloadEncoding; + + /** + * Freeform string for any naming strategy class to use. Clients should default to the vendor default if not supplied. + */ + @Nullable + @JsonProperty("schemaLookupStrategy") + @JsonPropertyDescription("Freeform string for any naming strategy class to use. Clients should default to the vendor default if not supplied.") + private String schemaLookupStrategy; + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageSchemaIdLocation.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageSchemaIdLocation.java new file mode 100644 index 00000000..5be49c3c --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageSchemaIdLocation.java @@ -0,0 +1,22 @@ +package com.asyncapi.bindings.kafka.v0._3_0.message; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Describes Kafka message schema id location. + * + * @see Kafka message binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 + */ +public enum KafkaMessageSchemaIdLocation { + + @JsonProperty("header") + HEADER, + + @JsonProperty("payload") + PAYLOAD + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/operation/KafkaOperationBinding.java new file mode 100644 index 00000000..5b00fc68 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/operation/KafkaOperationBinding.java @@ -0,0 +1,51 @@ +package com.asyncapi.bindings.kafka.v0._3_0.operation; + +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka operation binding. + * + * @see Kafka operation binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class KafkaOperationBinding extends com.asyncapi.bindings.kafka.KafkaOperationBinding { + + /** + * Id of the consumer group. + */ + @Nullable + @JsonProperty("groupId") + @JsonPropertyDescription("Id of the consumer group.") + private AsyncAPISchema groupId; + + /** + * Id of the consumer inside a consumer group. + */ + @Nullable + @JsonProperty("clientId") + @JsonPropertyDescription("Id of the consumer inside a consumer group.") + private AsyncAPISchema clientId; + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/server/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/server/KafkaServerBinding.java new file mode 100644 index 00000000..08458e48 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/server/KafkaServerBinding.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.kafka.v0._3_0.server; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka server binding. + * + * @see Kafka server binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes Kafka server binding.") +public class KafkaServerBinding extends com.asyncapi.bindings.kafka.KafkaServerBinding { + + /** + * API URL for the Schema Registry used when producing Kafka messages (if a Schema Registry was used) + */ + @Nullable + @JsonProperty("schemaRegistryUrl") + @JsonPropertyDescription("API URL for the Schema Registry used when producing Kafka messages (if a Schema Registry was used)") + private String schemaRegistryUrl; + + /** + * MUST NOT be specified if schemaRegistryUrl is not specified + *

+ * The vendor of Schema Registry and Kafka serdes library that should be used (e.g. apicurio, confluent, ibm, or karapace) + */ + @Nullable + @JsonProperty("schemaRegistryVendor") + @JsonPropertyDescription("The vendor of Schema Registry and Kafka serdes library that should be used (e.g. apicurio, confluent, ibm, or karapace)") + private String schemaRegistryVendor; + + @Override + public String getBindingVersion() { + return "0.3.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.3.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java index 071bd331..96e47a1c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java @@ -25,6 +25,7 @@ public class KafkaMessageBinding extends com.asyncapi.bindings.kafka.KafkaMessag /** * The message key. */ + // TODO: Reference, AsyncAPISchema, AvroSchema @Nullable @JsonProperty("key") @JsonPropertyDescription("The message key.") diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelBinding.java new file mode 100644 index 00000000..ef2cf779 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelBinding.java @@ -0,0 +1,80 @@ +package com.asyncapi.bindings.kafka.v0._5_0.channel; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka channel binding. + * + * @see Kafka channel binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.5.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes Kafka channel binding.") +public class KafkaChannelBinding extends com.asyncapi.bindings.kafka.KafkaChannelBinding { + + /** + * Kafka topic name if different from channel name. + */ + @Nullable + @JsonProperty("topic") + @JsonPropertyDescription("Kafka topic name if different from channel name.") + private String topic; + + /** + * Number of partitions configured on this topic (useful to know how many parallel consumers you may run). + *

+ * MUST be positive. + */ + @Nullable + @javax.validation.constraints.Min( + value = 1, + message = "Number of partitions must be greater or equals to 1" + ) + @JsonProperty("partitions") + @JsonPropertyDescription("Number of partitions configured on this topic (useful to know how many parallel consumers you may run).") + private Integer partitions; + + /** + * Number of replicas configured on this topic. + *

+ * MUST be positive. + */ + @Nullable + @javax.validation.constraints.Min( + value = 1, + message = "Number of replicas must be greater or equals to 1" + ) + @JsonProperty("replicas") + @JsonPropertyDescription("Number of replicas configured on this topic.") + private Integer replicas; + + /** + * Topic configuration properties that are relevant for the API. + */ + @Nullable + @JsonProperty("topicConfiguration") + @JsonPropertyDescription("Topic configuration properties that are relevant for the API.") + private KafkaChannelTopicConfiguration topicConfiguration; + + @Override + public String getBindingVersion() { + return "0.5.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.5.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelTopicCleanupPolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelTopicCleanupPolicy.java new file mode 100644 index 00000000..80aab245 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelTopicCleanupPolicy.java @@ -0,0 +1,21 @@ +package com.asyncapi.bindings.kafka.v0._5_0.channel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Kafka channel cleanup policy. + * + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.5.0 + * @since 1.0.0-RC2 + */ +public enum KafkaChannelTopicCleanupPolicy { + + @JsonProperty("compact") + COMPACT, + + @JsonProperty("delete") + DELETE + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelTopicConfiguration.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelTopicConfiguration.java new file mode 100644 index 00000000..8159dfcb --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelTopicConfiguration.java @@ -0,0 +1,125 @@ +package com.asyncapi.bindings.kafka.v0._5_0.channel; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * This objects contains information about the API relevant topic configuration in Kafka. + * + * @see Kafka channel binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.5.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class KafkaChannelTopicConfiguration { + + /** + * The cleanup.policy configuration option. + *

+ * array may only contain delete and/or compact + */ + @Nullable + @JsonProperty("cleanup.policy") + private List cleanupPolicy; + + /** + * The retention.ms configuration option. + */ + @Nullable + @javax.validation.constraints.Min( + value = -1, + message = "retention.ms must be greater or equals to -1" + ) + @JsonProperty("retention.ms") + @JsonPropertyDescription("The [`retention.ms`](https://kafka.apache.org/documentation/#topicconfigs_retention.ms) configuration option.") + private Integer retentionMs; + + /** + * The retention.bytes configuration option. + */ + @Nullable + @javax.validation.constraints.Min( + value = -1, + message = "retention.bytes must be greater or equals to -1" + ) + @JsonProperty("retention.bytes") + @JsonPropertyDescription("The [`retention.bytes`](https://kafka.apache.org/documentation/#topicconfigs_retention.bytes) configuration option.") + private Integer retentionBytes; + + /** + * The delete.retention.ms configuration option. + */ + @Nullable + @javax.validation.constraints.Min( + value = 0, + message = "delete.retention.ms must be greater or equals to 0" + ) + @JsonProperty("delete.retention.ms") + @JsonPropertyDescription("The [`delete.retention.ms`](https://kafka.apache.org/documentation/#topicconfigs_delete.retention.ms) configuration option.") + private Integer deleteRetentionMs; + + /** + * The max.message.bytes configuration option. + */ + @Nullable + @javax.validation.constraints.Min( + value = 0, + message = "max.message.bytes must be greater or equals to 0" + ) + @JsonProperty("max.message.bytes") + @JsonPropertyDescription("The [`max.message.bytes`](https://kafka.apache.org/documentation/#topicconfigs_max.message.bytes) configuration option.") + private Integer maxMessageBytes; + + /** + * It shows whether the schema validation for the message key is enabled. + *

+ * Vendor specific config. + * For more details: confluent.key.schema.validation + */ + @Nullable + @JsonProperty("confluent.key.schema.validation") + private Boolean confluentKeySchemaValidation; + + /** + * The name of the schema lookup strategy for the message key. + *

+ * Vendor specific config. + * For more details: confluent.key.subject.name.strategy + */ + @Nullable + @JsonProperty("confluent.key.subject.name.strategy") + private String confluentKeySubjectNameStrategy; + + /** + * It shows whether the schema validation for the message value is enabled. + *

+ * Vendor specific config. + * For more details: confluent.value.schema.validation + */ + @Nullable + @JsonProperty("confluent.value.schema.validation") + private Boolean confluentValueSchemaValidation; + + /** + * The name of the schema lookup strategy for the message value. + *

+ * Vendor specific config. + * For more details: confluent.value.subject.name.strategy + */ + @Nullable + @JsonProperty("confluent.value.subject.name.strategy") + private String confluentValueSubjectNameStrategy; + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageBinding.java new file mode 100644 index 00000000..5f24fcff --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageBinding.java @@ -0,0 +1,68 @@ +package com.asyncapi.bindings.kafka.v0._5_0.message; + +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka message binding. + * + * @see Kafka message binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.5.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class KafkaMessageBinding extends com.asyncapi.bindings.kafka.KafkaMessageBinding { + + /** + * The message key. + */ + // TODO: Reference, AsyncAPISchema + @Nullable + @JsonProperty("key") + @JsonPropertyDescription("The message key.") + private AsyncAPISchema key; + + /** + * If a Schema Registry is used when performing this operation, tells where the id of schema is stored (e.g. header or payload). + */ + @Nullable + @JsonProperty("schemaIdLocation") + @JsonPropertyDescription("If a Schema Registry is used when performing this operation, tells where the id of schema is stored (e.g. header or payload).") + private KafkaMessageSchemaIdLocation schemaIdLocation; + + /** + * Number of bytes or vendor specific values when schema id is encoded in payload (e.g confluent/ apicurio-legacy / apicurio-new). + */ + @Nullable + @JsonProperty("schemaIdPayloadEncoding") + @JsonPropertyDescription("Number of bytes or vendor specific values when schema id is encoded in payload (e.g confluent/ apicurio-legacy / apicurio-new).") + private String schemaIdPayloadEncoding; + + /** + * Freeform string for any naming strategy class to use. Clients should default to the vendor default if not supplied. + */ + @Nullable + @JsonProperty("schemaLookupStrategy") + @JsonPropertyDescription("Freeform string for any naming strategy class to use. Clients should default to the vendor default if not supplied.") + private String schemaLookupStrategy; + + @Override + public String getBindingVersion() { + return "0.5.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.5.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageSchemaIdLocation.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageSchemaIdLocation.java new file mode 100644 index 00000000..034511f2 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageSchemaIdLocation.java @@ -0,0 +1,22 @@ +package com.asyncapi.bindings.kafka.v0._5_0.message; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Describes Kafka message schema id location. + * + * @see Kafka message binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.5.0 + * @since 1.0.0-RC2 + */ +public enum KafkaMessageSchemaIdLocation { + + @JsonProperty("header") + HEADER, + + @JsonProperty("payload") + PAYLOAD + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/operation/KafkaOperationBinding.java new file mode 100644 index 00000000..1ee0b104 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/operation/KafkaOperationBinding.java @@ -0,0 +1,51 @@ +package com.asyncapi.bindings.kafka.v0._5_0.operation; + +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka operation binding. + * + * @see Kafka operation binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.5.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class KafkaOperationBinding extends com.asyncapi.bindings.kafka.KafkaOperationBinding { + + /** + * Id of the consumer group. + */ + @Nullable + @JsonProperty("groupId") + @JsonPropertyDescription("Id of the consumer group.") + private AsyncAPISchema groupId; + + /** + * Id of the consumer inside a consumer group. + */ + @Nullable + @JsonProperty("clientId") + @JsonPropertyDescription("Id of the consumer inside a consumer group.") + private AsyncAPISchema clientId; + + @Override + public String getBindingVersion() { + return "0.5.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.5.0"); + } + +} diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/server/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/server/KafkaServerBinding.java new file mode 100644 index 00000000..e9637d77 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/server/KafkaServerBinding.java @@ -0,0 +1,54 @@ +package com.asyncapi.bindings.kafka.v0._5_0.server; + +import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import lombok.*; +import org.jetbrains.annotations.Nullable; + +/** + * Describes Kafka server binding. + * + * @see Kafka server binding + * @see Kafka + * @author Pavel Bodiachevskii + * @version 0.5.0 + * @since 1.0.0-RC2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonClassDescription("Describes Kafka server binding.") +public class KafkaServerBinding extends com.asyncapi.bindings.kafka.KafkaServerBinding { + + /** + * API URL for the Schema Registry used when producing Kafka messages (if a Schema Registry was used) + */ + @Nullable + @JsonProperty("schemaRegistryUrl") + @JsonPropertyDescription("API URL for the Schema Registry used when producing Kafka messages (if a Schema Registry was used)") + private String schemaRegistryUrl; + + /** + * MUST NOT be specified if schemaRegistryUrl is not specified + *

+ * The vendor of Schema Registry and Kafka serdes library that should be used (e.g. apicurio, confluent, ibm, or karapace) + */ + @Nullable + @JsonProperty("schemaRegistryVendor") + @JsonPropertyDescription("The vendor of Schema Registry and Kafka serdes library that should be used (e.g. apicurio, confluent, ibm, or karapace)") + private String schemaRegistryVendor; + + @Override + public String getBindingVersion() { + return "0.5.0"; + } + + @Override + public void setBindingVersion(@Nullable String bindingVersion) { + super.setBindingVersion("0.5.0"); + } + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaLatestTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaLatestTest.java index f119e6d5..d164d446 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaLatestTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaLatestTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.kafka; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._5_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,7 +14,7 @@ public class KafkaLatestTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = KafkaV0_4_0Test.channelBinding(); + super.binding = KafkaV0_5_0Test.channelBinding(); super.bindingTypeClass = KafkaChannelBinding.class; super.pathToBindingJson = "/bindings/kafka/latest/channel/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/latest/channel/binding - extended.json"; @@ -24,7 +24,7 @@ class ChannelTest extends BindingTest {{ @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = KafkaV0_4_0Test.messageBinding(); + super.binding = KafkaV0_5_0Test.messageBinding(); super.bindingTypeClass = KafkaMessageBinding.class; super.pathToBindingJson = "/bindings/kafka/latest/message/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/latest/message/binding - extended.json"; @@ -34,7 +34,7 @@ class Message extends BindingTest {{ @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = KafkaV0_4_0Test.operationBinding(); + super.binding = KafkaV0_5_0Test.operationBinding(); super.bindingTypeClass = KafkaOperationBinding.class; super.pathToBindingJson = "/bindings/kafka/latest/operation/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/latest/operation/binding - extended.json"; @@ -44,7 +44,7 @@ class Operation extends BindingTest {{ @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = KafkaV0_4_0Test.serverBinding(); + super.binding = KafkaV0_5_0Test.serverBinding(); super.bindingTypeClass = KafkaServerBinding.class; super.pathToBindingJson = "/bindings/kafka/latest/server/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/latest/server/binding - extended.json"; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaUnknownVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaUnknownVersionTest.java index 290af9e4..4d38fbb4 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaUnknownVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaUnknownVersionTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.kafka; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._5_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,7 +14,7 @@ public class KafkaUnknownVersionTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = KafkaV0_4_0Test.channelBinding(); + super.binding = KafkaV0_5_0Test.channelBinding(); super.bindingTypeClass = KafkaChannelBinding.class; super.pathToBindingJson = "/bindings/kafka/unknown version/channel/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/unknown version/channel/binding - extended.json"; @@ -24,7 +24,7 @@ class ChannelTest extends BindingTest {{ @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = KafkaV0_4_0Test.messageBinding(); + super.binding = KafkaV0_5_0Test.messageBinding(); super.bindingTypeClass = KafkaMessageBinding.class; super.pathToBindingJson = "/bindings/kafka/unknown version/message/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/unknown version/message/binding - extended.json"; @@ -34,7 +34,7 @@ class Message extends BindingTest {{ @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = KafkaV0_4_0Test.operationBinding(); + super.binding = KafkaV0_5_0Test.operationBinding(); super.bindingTypeClass = KafkaOperationBinding.class; super.pathToBindingJson = "/bindings/kafka/unknown version/operation/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/unknown version/operation/binding - extended.json"; @@ -44,7 +44,7 @@ class Operation extends BindingTest {{ @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = KafkaV0_4_0Test.serverBinding(); + super.binding = KafkaV0_5_0Test.serverBinding(); super.bindingTypeClass = KafkaServerBinding.class; super.pathToBindingJson = "/bindings/kafka/unknown version/server/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/unknown version/server/binding - extended.json"; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_1_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_1_0Test.java new file mode 100644 index 00000000..daf94de7 --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_1_0Test.java @@ -0,0 +1,88 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.kafka.v0._1_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._1_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._1_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._1_0.server.KafkaServerBinding; +import com.asyncapi.schemas.Type; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.1.0") +public class KafkaV0_1_0Test { + + public static KafkaChannelBinding channelBinding () { + return new KafkaChannelBinding(); + } + + public static KafkaMessageBinding messageBinding () { + return KafkaMessageBinding.builder() + .key(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myKey")) + .build()) + .build(); + } + + public static KafkaOperationBinding operationBinding () { + return KafkaOperationBinding.builder() + .groupId(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myGroupId")) + .build()) + .clientId(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myClientId")) + .build()) + .build(); + } + + public static KafkaServerBinding serverBinding () { + return new KafkaServerBinding(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = KafkaChannelBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.1.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.1.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.1.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = KafkaMessageBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.1.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.1.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.1.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = KafkaOperationBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.1.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.1.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.1.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = KafkaServerBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.1.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.1.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.1.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_3_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_3_0Test.java new file mode 100644 index 00000000..73dd017e --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_3_0Test.java @@ -0,0 +1,99 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.kafka.v0._3_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._3_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._3_0.message.KafkaMessageSchemaIdLocation; +import com.asyncapi.bindings.kafka.v0._3_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._3_0.server.KafkaServerBinding; +import com.asyncapi.schemas.Type; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.3.0") +public class KafkaV0_3_0Test { + + public static KafkaChannelBinding channelBinding () { + return KafkaChannelBinding.builder() + .topic("my-specific-topic") + .partitions(20) + .replicas(3) + .build(); + } + + public static KafkaMessageBinding messageBinding () { + return KafkaMessageBinding.builder() + .key(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myKey")) + .build()) + .schemaIdLocation(KafkaMessageSchemaIdLocation.PAYLOAD) + .schemaIdPayloadEncoding("apicurio-new") + .schemaLookupStrategy("TopicIdStrategy") + .build(); + } + + public static KafkaOperationBinding operationBinding () { + return KafkaOperationBinding.builder() + .groupId(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myGroupId")) + .build()) + .clientId(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myClientId")) + .build()) + .build(); + } + + public static KafkaServerBinding serverBinding () { + return KafkaServerBinding.builder() + .schemaRegistryUrl("https://my-schema-registry.com") + .schemaRegistryVendor("confluent") + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = KafkaChannelBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.3.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.3.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.3.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = KafkaMessageBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.3.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.3.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.3.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = KafkaOperationBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.3.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.3.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.3.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = KafkaServerBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.3.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.3.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.3.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_5_0Test.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_5_0Test.java new file mode 100644 index 00000000..e75a81eb --- /dev/null +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaV0_5_0Test.java @@ -0,0 +1,112 @@ +package com.asyncapi.bindings.kafka; + +import com.asyncapi.bindings.BindingTest; +import com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelTopicCleanupPolicy; +import com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelTopicConfiguration; +import com.asyncapi.bindings.kafka.v0._5_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._5_0.message.KafkaMessageSchemaIdLocation; +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding; +import com.asyncapi.schemas.Type; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; + +import java.util.List; + +@DisplayName("0.5.0") +public class KafkaV0_5_0Test { + + public static KafkaChannelBinding channelBinding () { + return KafkaChannelBinding.builder() + .topic("my-specific-topic-name") + .partitions(20) + .replicas(3) + .topicConfiguration(KafkaChannelTopicConfiguration.builder() + .cleanupPolicy(List.of( + KafkaChannelTopicCleanupPolicy.DELETE, + KafkaChannelTopicCleanupPolicy.COMPACT + )) + .retentionMs(604_800_000) + .retentionBytes(1_000_000_000) + .deleteRetentionMs(86_400_000) + .maxMessageBytes(1_048_588) + .build() + ) + .build(); + } + + public static KafkaMessageBinding messageBinding () { + return KafkaMessageBinding.builder() + .key(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myKey")) + .build()) + .schemaIdLocation(KafkaMessageSchemaIdLocation.PAYLOAD) + .schemaIdPayloadEncoding("apicurio-new") + .schemaLookupStrategy("TopicIdStrategy") + .build(); + } + + public static KafkaOperationBinding operationBinding () { + return KafkaOperationBinding.builder() + .groupId(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myGroupId")) + .build()) + .clientId(AsyncAPISchema.builder() + .type(Type.STRING) + .enumValue(List.of("myClientId")) + .build()) + .build(); + } + + public static KafkaServerBinding serverBinding () { + return KafkaServerBinding.builder() + .schemaRegistryUrl("https://my-schema-registry.com") + .schemaRegistryVendor("confluent") + .build(); + } + + @Nested + @DisplayName("channel") + class ChannelTest extends BindingTest {{ + super.binding = channelBinding(); + super.bindingTypeClass = KafkaChannelBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.5.0/channel/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.5.0/channel/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.5.0/channel/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("message") + class Message extends BindingTest {{ + super.binding = messageBinding(); + super.bindingTypeClass = KafkaMessageBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.5.0/message/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.5.0/message/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.5.0/message/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("operation") + class Operation extends BindingTest {{ + super.binding = operationBinding(); + super.bindingTypeClass = KafkaOperationBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.5.0/operation/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.5.0/operation/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.5.0/operation/binding - wrongly extended.json"; + }} + + @Nested + @DisplayName("server") + class Server extends BindingTest {{ + super.binding = serverBinding(); + super.bindingTypeClass = KafkaServerBinding.class; + super.pathToBindingJson = "/bindings/kafka/0.5.0/server/binding.json"; + super.pathToExtendedBindingJson = "/bindings/kafka/0.5.0/server/binding - extended.json"; + super.pathToWronglyExtendedBindingJson = "/bindings/kafka/0.5.0/server/binding - wrongly extended.json"; + }} + +} diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaWithoutVersionTest.java b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaWithoutVersionTest.java index 7ec6cd2f..2337f7ea 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaWithoutVersionTest.java +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/bindings/kafka/KafkaWithoutVersionTest.java @@ -1,10 +1,10 @@ package com.asyncapi.bindings.kafka; import com.asyncapi.bindings.BindingTest; -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding; -import com.asyncapi.bindings.kafka.v0._4_0.message.KafkaMessageBinding; -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding; -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding; +import com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelBinding; +import com.asyncapi.bindings.kafka.v0._5_0.message.KafkaMessageBinding; +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding; +import com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -14,7 +14,7 @@ public class KafkaWithoutVersionTest { @Nested @DisplayName("channel") class ChannelTest extends BindingTest {{ - super.binding = KafkaV0_4_0Test.channelBinding(); + super.binding = KafkaV0_5_0Test.channelBinding(); super.bindingTypeClass = KafkaChannelBinding.class; super.pathToBindingJson = "/bindings/kafka/without version/channel/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/without version/channel/binding - extended.json"; @@ -24,7 +24,7 @@ class ChannelTest extends BindingTest {{ @Nested @DisplayName("message") class Message extends BindingTest {{ - super.binding = KafkaV0_4_0Test.messageBinding(); + super.binding = KafkaV0_5_0Test.messageBinding(); super.bindingTypeClass = KafkaMessageBinding.class; super.pathToBindingJson = "/bindings/kafka/without version/message/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/without version/message/binding - extended.json"; @@ -34,7 +34,7 @@ class Message extends BindingTest {{ @Nested @DisplayName("operation") class Operation extends BindingTest {{ - super.binding = KafkaV0_4_0Test.operationBinding(); + super.binding = KafkaV0_5_0Test.operationBinding(); super.bindingTypeClass = KafkaOperationBinding.class; super.pathToBindingJson = "/bindings/kafka/without version/operation/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/without version/operation/binding - extended.json"; @@ -44,7 +44,7 @@ class Operation extends BindingTest {{ @Nested @DisplayName("server") class Server extends BindingTest {{ - super.binding = KafkaV0_4_0Test.serverBinding(); + super.binding = KafkaV0_5_0Test.serverBinding(); super.bindingTypeClass = KafkaServerBinding.class; super.pathToBindingJson = "/bindings/kafka/without version/server/binding.json"; super.pathToExtendedBindingJson = "/bindings/kafka/without version/server/binding - extended.json"; diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt index 8fdbdeac..e76fa945 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsKafka.kt @@ -11,7 +11,7 @@ import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt index 36329481..cb2b5624 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_0_0/StreetlightsOperationSecurity.kt @@ -11,7 +11,7 @@ import com.asyncapi.v2._0_0.model.component.Components import com.asyncapi.v2._0_0.model.info.Info import com.asyncapi.v2._0_0.model.info.License import com.asyncapi.v2._0_0.model.server.Server -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt index a20c1a06..b1d5c555 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsKafka.kt @@ -12,7 +12,7 @@ import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt index 1c52bd83..5bfe3dbf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v2/_6_0/StreetlightsOperationSecurity.kt @@ -11,7 +11,7 @@ import com.asyncapi.v2._6_0.model.component.Components import com.asyncapi.v2._6_0.model.info.Info import com.asyncapi.v2._6_0.model.info.License import com.asyncapi.v2._6_0.model.server.Server -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt index 34dc9264..7298dfa2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt @@ -14,11 +14,11 @@ import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.reply.OperationReply import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelBinding -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicCleanupPolicy -import com.asyncapi.bindings.kafka.v0._4_0.channel.KafkaChannelTopicConfiguration -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding +import com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelBinding +import com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelTopicCleanupPolicy +import com.asyncapi.bindings.kafka.v0._5_0.channel.KafkaChannelTopicConfiguration +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.multiformat.AvroFormatSchema import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt index e98e7bac..451e19b7 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsKafkaAsyncAPI.kt @@ -13,7 +13,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import java.math.BigDecimal diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt index 5be15fa3..4048a458 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/StreetlightsOperationSecurityAsyncAPI.kt @@ -12,7 +12,7 @@ import com.asyncapi.v3._0_0.model.operation.Operation import com.asyncapi.v3._0_0.model.operation.OperationAction import com.asyncapi.v3._0_0.model.operation.OperationTrait import com.asyncapi.v3._0_0.model.server.Server -import com.asyncapi.bindings.kafka.v0._4_0.operation.KafkaOperationBinding +import com.asyncapi.bindings.kafka.v0._5_0.operation.KafkaOperationBinding import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme import com.asyncapi.schemas.asyncapi.security.v3.oauth2.OAuth2SecurityScheme diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt index f20840e9..c085ab54 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/ChannelItemTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.channel.JMSChannelBinding -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mercure.v0._1_0.channel.MercureChannelBinding import com.asyncapi.bindings.mqtt.v0._2_0.channel.MQTTChannelBinding import com.asyncapi.bindings.mqtt5.v0._2_0.channel.MQTT5ChannelBinding @@ -62,7 +62,7 @@ class ChannelItemTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.channelBinding()), Pair("ibmmq", IBMMQV0_1_0Test.channelBinding()), Pair("jms", JMSChannelBinding()), - Pair("kafka", KafkaV0_4_0Test.channelBinding()), + Pair("kafka", KafkaV0_5_0Test.channelBinding()), Pair("mercure", MercureChannelBinding()), Pair("mqtt", MQTTChannelBinding()), Pair("mqtt5", MQTT5ChannelBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt index 2011ce8b..8a974d6b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding @@ -123,7 +123,7 @@ class MessageTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", JMSMessageBinding()), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", MercureMessageBinding()), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", MQTT5MessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt index 3ef9a8ed..b5336ca3 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt @@ -11,7 +11,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test import com.asyncapi.bindings.jms.v0._0_1.message.JMSMessageBinding -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mercure.v0._1_0.message.MercureMessageBinding import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.mqtt5.v0._2_0.message.MQTT5MessageBinding @@ -81,7 +81,7 @@ class MessageTraitTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.messageBinding()), Pair("ibmmq", IBMMQV0_1_0Test.messageBinding()), Pair("jms", JMSMessageBinding()), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", MercureMessageBinding()), Pair("mqtt", MQTTV0_1_0Test.messageBinding()), Pair("mqtt5", MQTT5MessageBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt index 19ec20c2..3c42b4d8 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt @@ -13,7 +13,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding @@ -108,7 +108,7 @@ class OperationTest { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", IBMMQOperationBinding()), Pair("jms", JMSOperationBinding()), - Pair("kafka", KafkaV0_4_0Test.operationBinding()), + Pair("kafka", KafkaV0_5_0Test.operationBinding()), Pair("mercure", MercureOperationBinding()), Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", MQTT5OperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt index 03fb8e35..20af9bdf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.operation.IBMMQOperationBinding import com.asyncapi.bindings.jms.v0._0_1.operation.JMSOperationBinding -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mercure.v0._1_0.operation.MercureOperationBinding import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.mqtt5.v0._2_0.operation.MQTT5OperationBinding @@ -58,7 +58,7 @@ class OperationTraitTest: SerDeTest() { Pair("http", HTTPV0_3_0Test.operationBinding()), Pair("ibmmq", IBMMQOperationBinding()), Pair("jms", JMSOperationBinding()), - Pair("kafka", KafkaV0_4_0Test.operationBinding()), + Pair("kafka", KafkaV0_5_0Test.operationBinding()), Pair("mercure", MercureOperationBinding()), Pair("mqtt", MQTTV0_1_0Test.operationBinding()), Pair("mqtt5", MQTT5OperationBinding()), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt index 8a41b8ff..dd566e37 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding +import com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt index 5726c7c7..d5f801e2 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/ChannelItemTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.websockets.WebSocketsV0_1_0Test @@ -57,7 +57,7 @@ class ChannelItemTest: SerDeTest() { Pair("jms", Reference("#/components/channelBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.channelBinding()), + Pair("kafka", KafkaV0_5_0Test.channelBinding()), Pair("mercure", Reference("#/components/channelBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt index 63ef185a..f526d57b 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test class MessageTest: SerDeTest() { @@ -101,7 +101,7 @@ class MessageTest: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt index 5612f801..2162a8cf 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/message/MessageTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test class MessageTraitTest: SerDeTest() { @@ -72,7 +72,7 @@ class MessageTraitTest: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt index e07614d9..6ea70aab 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTest.kt @@ -8,7 +8,7 @@ import com.asyncapi.v2._6_0.model.channel.message.MessageTest import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.SolaceV0_4_0Test @@ -153,7 +153,7 @@ class OperationTest { Pair("jms", Reference("#/components/operationBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.operationBinding()), + Pair("kafka", KafkaV0_5_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt index f8a85720..e29f828e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/channel/operation/OperationTraitTest.kt @@ -6,7 +6,7 @@ import com.asyncapi.v2._6_0.model.ExternalDocumentation import com.asyncapi.v2._6_0.model.Tag import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.SolaceV0_4_0Test @@ -57,7 +57,7 @@ class OperationTraitTest: SerDeTest() { Pair("jms", Reference("#/components/operationBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.operationBinding()), + Pair("kafka", KafkaV0_5_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt index a9ac86de..6c341c7e 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding +import com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt index 7f1a715f..1ca7008d 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/ChannelTest.kt @@ -12,7 +12,7 @@ import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.pulsar.PulsarV0_1_0Test import com.asyncapi.bindings.websockets.WebSocketsV0_1_0Test @@ -77,7 +77,7 @@ class ChannelTest: SerDeTest() { Pair("jms", Reference("#/components/channelBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.channelBinding()), + Pair("kafka", KafkaV0_5_0Test.channelBinding()), Pair("mercure", Reference("#/components/channelBindings/mercure") ), @@ -174,7 +174,7 @@ class ChannelTestWithReference: SerDeTest() { Pair("jms", Reference("#/components/channelBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.channelBinding()), + Pair("kafka", KafkaV0_5_0Test.channelBinding()), Pair("mercure", Reference("#/components/channelBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt index beba4bae..db5c7adb 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTest.kt @@ -9,7 +9,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.schemas.asyncapi.AsyncAPISchema import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema @@ -97,7 +97,7 @@ class MessageTestWithSchema: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), @@ -174,7 +174,7 @@ class MessageTestWithReference: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), @@ -297,7 +297,7 @@ class MessageTestWithMultiFormatSchema: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt index 77a10e5b..4f006572 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/channel/message/MessageTraitTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.anypointmq.AnypointMQV0_0_1Test import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_1_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.IBMMQV0_1_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.schemas.asyncapi.multiformat.AsyncAPIFormatSchema @@ -71,7 +71,7 @@ class MessageTraitTestWithSchema: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), @@ -148,7 +148,7 @@ class MessageTraitTestWithReference: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), @@ -248,7 +248,7 @@ class MessageTraitTestWithMultiFormatSchema: SerDeTest() { Pair("jms", Reference("#/components/messageBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.messageBinding()), + Pair("kafka", KafkaV0_5_0Test.messageBinding()), Pair("mercure", Reference("#/components/messageBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt index 3959e630..543d25be 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.SolaceV0_4_0Test @@ -80,7 +80,7 @@ class OperationTest: SerDeTest() { Pair("jms", Reference("#/components/operationBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.operationBinding()), + Pair("kafka", KafkaV0_5_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), @@ -160,7 +160,7 @@ class OperationTestWithReference: SerDeTest() { Pair("jms", Reference("#/components/operationBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.operationBinding()), + Pair("kafka", KafkaV0_5_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt index 7572b97a..b08d59d9 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/operation/OperationTraitTest.kt @@ -2,7 +2,7 @@ package com.asyncapi.v3._0_0.model.operation import com.asyncapi.bindings.amqp.AMQPV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test -import com.asyncapi.bindings.kafka.KafkaV0_4_0Test +import com.asyncapi.bindings.kafka.KafkaV0_5_0Test import com.asyncapi.bindings.mqtt.MQTTV0_1_0Test import com.asyncapi.bindings.nats.NATSV0_1_0Test import com.asyncapi.bindings.solace.SolaceV0_4_0Test @@ -60,7 +60,7 @@ class OperationTraitTest: SerDeTest() { Pair("jms", Reference("#/components/operationBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.operationBinding()), + Pair("kafka", KafkaV0_5_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), @@ -138,7 +138,7 @@ class OperationTraitTestWithReference: SerDeTest() { Pair("jms", Reference("#/components/operationBindings/jms") ), - Pair("kafka", KafkaV0_4_0Test.operationBinding()), + Pair("kafka", KafkaV0_5_0Test.operationBinding()), Pair("mercure", Reference("#/components/operationBindings/mercure") ), diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt index 17b95ccd..993c5f02 100644 --- a/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt +++ b/asyncapi-core/src/test/kotlin/com/asyncapi/v3/_0_0/model/server/ServerTest.kt @@ -10,7 +10,7 @@ import com.asyncapi.bindings.googlepubsub.GooglePubSubV0_2_0Test import com.asyncapi.bindings.http.HTTPV0_3_0Test import com.asyncapi.bindings.ibmmq.v0._1_0.server.IBMMQServerBinding import com.asyncapi.bindings.jms.v0._0_1.server.JMSServerBinding -import com.asyncapi.bindings.kafka.v0._4_0.server.KafkaServerBinding +import com.asyncapi.bindings.kafka.v0._5_0.server.KafkaServerBinding import com.asyncapi.bindings.mercure.v0._1_0.server.MercureServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerBinding import com.asyncapi.bindings.mqtt.v0._1_0.server.MQTTServerLastWillConfiguration diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/channel/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding - extended.json new file mode 100644 index 00000000..1edca79f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding - extended.json @@ -0,0 +1,12 @@ +{ + "bindingVersion" : "0.1.0", + "key" : { + "type" : "string", + "enum" : [ "myKey" ] + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..b1eb7fca --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding - wrongly extended.json @@ -0,0 +1,15 @@ +{ + "bindingVersion": "0.1.0", + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding.json new file mode 100644 index 00000000..836ae2c6 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/message/binding.json @@ -0,0 +1,9 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding - extended.json new file mode 100644 index 00000000..e70ae008 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.1.0", + "groupId" : { + "type" : "string", + "enum" : [ "myGroupId" ] + }, + "clientId" : { + "type" : "string", + "enum" : [ "myClientId" ] + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..fcbcb92d --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion": "0.1.0", + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding.json new file mode 100644 index 00000000..9e8c365a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/operation/binding.json @@ -0,0 +1,15 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding - extended.json new file mode 100644 index 00000000..32459b79 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding - extended.json @@ -0,0 +1,8 @@ +{ + "bindingVersion" : "0.1.0", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..a1ecfd51 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding - wrongly extended.json @@ -0,0 +1,9 @@ +{ + "bindingVersion": "0.1.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding.json new file mode 100644 index 00000000..04dbf945 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.1.0/server/binding.json @@ -0,0 +1,3 @@ +{ + "bindingVersion": "0.1.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding - extended.json new file mode 100644 index 00000000..7da53e23 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding - extended.json @@ -0,0 +1,11 @@ +{ + "bindingVersion" : "0.3.0", + "topic" : "my-specific-topic", + "partitions" : 20, + "replicas" : 3, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..2f52b583 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding - wrongly extended.json @@ -0,0 +1,12 @@ +{ + "bindingVersion": "0.3.0", + "topic": "my-specific-topic", + "partitions": 20, + "replicas": 3, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding.json new file mode 100644 index 00000000..4331179c --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/channel/binding.json @@ -0,0 +1,6 @@ +{ + "topic": "my-specific-topic", + "partitions": 20, + "replicas": 3, + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding - extended.json new file mode 100644 index 00000000..49ae2a1a --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding - extended.json @@ -0,0 +1,15 @@ +{ + "bindingVersion" : "0.3.0", + "key" : { + "type" : "string", + "enum" : [ "myKey" ] + }, + "schemaIdLocation" : "payload", + "schemaIdPayloadEncoding" : "apicurio-new", + "schemaLookupStrategy" : "TopicIdStrategy", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..28107eef --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion": "0.3.0", + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding.json new file mode 100644 index 00000000..0765f233 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/message/binding.json @@ -0,0 +1,12 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding - extended.json new file mode 100644 index 00000000..22a69d15 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.3.0", + "groupId" : { + "type" : "string", + "enum" : [ "myGroupId" ] + }, + "clientId" : { + "type" : "string", + "enum" : [ "myClientId" ] + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..0b9b43b7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "bindingVersion": "0.3.0", + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding.json new file mode 100644 index 00000000..f6395463 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/operation/binding.json @@ -0,0 +1,15 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding - extended.json new file mode 100644 index 00000000..a54a22d5 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.3.0", + "schemaRegistryUrl" : "https://my-schema-registry.com", + "schemaRegistryVendor" : "confluent", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..08b0d66e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "0.3.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding.json new file mode 100644 index 00000000..40cbc297 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.3.0/server/binding.json @@ -0,0 +1,5 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "0.3.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding - extended.json new file mode 100644 index 00000000..ca0c307f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding - extended.json @@ -0,0 +1,18 @@ +{ + "bindingVersion" : "0.5.0", + "topic" : "my-specific-topic-name", + "partitions" : 20, + "replicas" : 3, + "topicConfiguration" : { + "cleanup.policy" : [ "delete", "compact" ], + "retention.ms" : 604800000, + "retention.bytes" : 1000000000, + "delete.retention.ms" : 86400000, + "max.message.bytes" : 1048588 + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding - wrongly extended.json new file mode 100644 index 00000000..6abc5689 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding - wrongly extended.json @@ -0,0 +1,22 @@ +{ + "topic": "my-specific-topic-name", + "partitions": 20, + "replicas": 3, + "topicConfiguration": { + "cleanup.policy": [ + "delete", + "compact" + ], + "retention.ms": 604800000, + "retention.bytes": 1000000000, + "delete.retention.ms": 86400000, + "max.message.bytes": 1048588 + }, + "bindingVersion": "0.5.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding.json new file mode 100644 index 00000000..a92ec434 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/channel/binding.json @@ -0,0 +1,16 @@ +{ + "topic": "my-specific-topic-name", + "partitions": 20, + "replicas": 3, + "topicConfiguration": { + "cleanup.policy": [ + "delete", + "compact" + ], + "retention.ms": 604800000, + "retention.bytes": 1000000000, + "delete.retention.ms": 86400000, + "max.message.bytes": 1048588 + }, + "bindingVersion": "0.5.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding - extended.json new file mode 100644 index 00000000..c71f4e0e --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding - extended.json @@ -0,0 +1,15 @@ +{ + "bindingVersion" : "0.5.0", + "key" : { + "type" : "string", + "enum" : [ "myKey" ] + }, + "schemaIdLocation" : "payload", + "schemaIdPayloadEncoding" : "apicurio-new", + "schemaLookupStrategy" : "TopicIdStrategy", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding - wrongly extended.json new file mode 100644 index 00000000..48d3c7bd --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding - wrongly extended.json @@ -0,0 +1,18 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "bindingVersion": "0.5.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding.json new file mode 100644 index 00000000..b667ea91 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/message/binding.json @@ -0,0 +1,12 @@ +{ + "key": { + "type": "string", + "enum": [ + "myKey" + ] + }, + "schemaIdLocation": "payload", + "schemaIdPayloadEncoding": "apicurio-new", + "schemaLookupStrategy": "TopicIdStrategy", + "bindingVersion": "0.5.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding - extended.json new file mode 100644 index 00000000..1199dffb --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding - extended.json @@ -0,0 +1,16 @@ +{ + "bindingVersion" : "0.5.0", + "groupId" : { + "type" : "string", + "enum" : [ "myGroupId" ] + }, + "clientId" : { + "type" : "string", + "enum" : [ "myClientId" ] + }, + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding - wrongly extended.json new file mode 100644 index 00000000..65e5268f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding - wrongly extended.json @@ -0,0 +1,21 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "0.5.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding.json new file mode 100644 index 00000000..4d21c790 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/operation/binding.json @@ -0,0 +1,15 @@ +{ + "groupId": { + "type": "string", + "enum": [ + "myGroupId" + ] + }, + "clientId": { + "type": "string", + "enum": [ + "myClientId" + ] + }, + "bindingVersion": "0.5.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding - extended.json new file mode 100644 index 00000000..0622c2d7 --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding - extended.json @@ -0,0 +1,10 @@ +{ + "bindingVersion" : "0.5.0", + "schemaRegistryUrl" : "https://my-schema-registry.com", + "schemaRegistryVendor" : "confluent", + "x-number" : 0, + "x-string" : "", + "x-object" : { + "property" : { } + } +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding - wrongly extended.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding - wrongly extended.json new file mode 100644 index 00000000..673854df --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding - wrongly extended.json @@ -0,0 +1,11 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "0.5.0", + "x-number": 0, + "x-string": "", + "x-object": { + "property": {} + }, + "ext-number": 1 +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding.json b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding.json new file mode 100644 index 00000000..afc8605f --- /dev/null +++ b/asyncapi-core/src/test/resources/bindings/kafka/0.5.0/server/binding.json @@ -0,0 +1,5 @@ +{ + "schemaRegistryUrl": "https://my-schema-registry.com", + "schemaRegistryVendor": "confluent", + "bindingVersion": "0.5.0" +} \ No newline at end of file diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - extended.json index 1b79a719..ca0c307f 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/channel/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - extended.json index 3325c99e..c71f4e0e 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/message/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - extended.json index c86580a4..1199dffb 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/operation/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - extended.json index a0eb3c82..0622c2d7 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/latest/server/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - extended.json index 1b79a719..ca0c307f 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/channel/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - extended.json index 3325c99e..c71f4e0e 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/message/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - extended.json index c86580a4..1199dffb 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/operation/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - extended.json index a0eb3c82..0622c2d7 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/unknown version/server/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - extended.json index 1b79a719..ca0c307f 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/channel/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - extended.json index 3325c99e..c71f4e0e 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/message/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - extended.json index c86580a4..1199dffb 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/operation/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - extended.json b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - extended.json index a0eb3c82..0622c2d7 100644 --- a/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - extended.json +++ b/asyncapi-core/src/test/resources/bindings/kafka/without version/server/binding - extended.json @@ -1,5 +1,5 @@ { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", "x-number" : 0, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json index 1b64732d..65b58dbe 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - extended.json @@ -62,7 +62,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -180,7 +180,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -371,7 +371,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -532,7 +532,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -723,7 +723,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -916,7 +916,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1049,7 +1049,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -1300,7 +1300,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1538,7 +1538,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -1722,7 +1722,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1807,7 +1807,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -1920,7 +1920,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -2086,7 +2086,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -2265,7 +2265,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - wrongly extended.json index 5a1b27bb..fc9008e2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi - wrongly extended.json @@ -58,7 +58,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -285,7 +285,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -530,7 +530,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { @@ -685,7 +685,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { @@ -812,7 +812,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { }, @@ -996,7 +996,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1220,7 +1220,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1365,7 +1365,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1416,7 +1416,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1531,7 +1531,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { }, @@ -1731,7 +1731,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json index f1188d16..3f41668f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/asyncapi.json @@ -58,7 +58,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -160,7 +160,7 @@ "type" : "string", "enum" : [ "myClientId" ] }, - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -347,7 +347,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -490,7 +490,7 @@ "type" : "string", "enum" : [ "myClientId" ] }, - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -677,7 +677,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { @@ -857,7 +857,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { @@ -984,7 +984,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { }, @@ -1218,7 +1218,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1441,7 +1441,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1611,7 +1611,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1662,7 +1662,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1778,7 +1778,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { }, @@ -1920,7 +1920,7 @@ "type" : "string", "enum" : [ "myClientId" ] }, - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -2089,7 +2089,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json index e617f01d..0d18bdd8 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - extended.json @@ -62,7 +62,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -253,7 +253,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -414,7 +414,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -605,7 +605,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -798,7 +798,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -931,7 +931,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json index 11fba602..6a132a8a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem - wrongly extended.json @@ -221,7 +221,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -485,7 +485,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { @@ -627,7 +627,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { @@ -754,7 +754,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json index 553e1de4..4e30b4a9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/channelItem.json @@ -62,7 +62,7 @@ "type" : "string", "enum" : [ "myClientId" ] }, - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -244,7 +244,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -382,7 +382,7 @@ "type" : "string", "enum" : [ "myClientId" ] }, - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -564,7 +564,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { @@ -739,7 +739,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { @@ -866,7 +866,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json index b04351d8..9a200ea8 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - extended.json @@ -96,7 +96,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - wrongly extended.json index c747ebca..3389d4a6 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message - wrongly extended.json @@ -101,7 +101,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message.json index 1c757572..59834cfa 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/message.json @@ -101,7 +101,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json index 3216b81d..a802897a 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - extended.json @@ -85,7 +85,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - wrongly extended.json index 4f3147eb..4976348e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait - wrongly extended.json @@ -90,7 +90,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait.json index 2c1e57c2..bd768a51 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/message/messageTrait.json @@ -90,7 +90,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json index f6aada7d..678bf2ee 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - extended.json @@ -60,7 +60,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -251,7 +251,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -444,7 +444,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json index d96877fc..af22b3ec 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message - wrongly extended.json @@ -219,7 +219,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -363,7 +363,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json index 14042f0e..9477baee 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with message.json @@ -60,7 +60,7 @@ "type" : "string", "enum" : [ "myClientId" ] }, - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -252,7 +252,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { @@ -427,7 +427,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json index 3e9e3607..8d79d203 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - extended.json @@ -60,7 +60,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -251,7 +251,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json index 7604eeb4..62a9beac 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message - wrongly extended.json @@ -60,7 +60,7 @@ "type" : "string", "enum" : [ "myClientId" ] }, - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -219,7 +219,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json index c1e4f78e..9796be7e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operation with reference to message.json @@ -60,7 +60,7 @@ "type" : "string", "enum" : [ "myClientId" ] }, - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -252,7 +252,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json index cd1ee0c6..78ec71a1 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - extended.json @@ -60,7 +60,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json index 5bb0b6a9..73589c5c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait - wrongly extended.json @@ -70,7 +70,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json index b00a74a0..8f2b4ee0 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/channel/operation/operationTrait.json @@ -70,7 +70,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json index c63c086b..623507f0 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - extended.json @@ -127,7 +127,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -365,7 +365,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -549,7 +549,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -634,7 +634,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -747,7 +747,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -913,7 +913,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -1092,7 +1092,7 @@ "bindingVersion" : "0.0.1" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - wrongly extended.json index d8f07acc..2dc2e814 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components - wrongly extended.json @@ -132,7 +132,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -355,7 +355,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -501,7 +501,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -552,7 +552,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -667,7 +667,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { }, @@ -867,7 +867,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json index 37f3072d..6818d88b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/components/components.json @@ -132,7 +132,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -355,7 +355,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -524,7 +524,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -575,7 +575,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -691,7 +691,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { }, "mqtt": { }, @@ -832,7 +832,7 @@ "type" : "string", "enum" : [ "myClientId" ] }, - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -1001,7 +1001,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json index 7c7296cb..ed813d6b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - extended.json @@ -42,7 +42,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - wrongly extended.json index 516339ec..4d75d119 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server - wrongly extended.json @@ -41,7 +41,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server.json b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server.json index 15d22480..b14cd8c2 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server.json +++ b/asyncapi-core/src/test/resources/json/v2/2.0.0/model/server/server.json @@ -38,7 +38,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json index 5b990e4c..48adbb86 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - extended.json @@ -71,7 +71,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -197,7 +197,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -325,7 +325,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -489,7 +489,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -619,7 +619,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -747,7 +747,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -908,7 +908,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1043,7 +1043,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -1205,7 +1205,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -1341,7 +1341,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -1469,7 +1469,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -1633,7 +1633,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1763,7 +1763,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -1891,7 +1891,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -2052,7 +2052,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2187,7 +2187,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -2364,7 +2364,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2617,7 +2617,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -2772,7 +2772,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2865,7 +2865,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -2978,7 +2978,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -3099,7 +3099,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -3212,7 +3212,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - wrongly extended.json index eaadce55..2a1e29a4 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi - wrongly extended.json @@ -70,7 +70,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -205,7 +205,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -366,7 +366,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -547,7 +547,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -698,7 +698,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -859,7 +859,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -1035,7 +1035,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1190,7 +1190,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -1342,7 +1342,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1494,7 +1494,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -1655,7 +1655,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -1836,7 +1836,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1987,7 +1987,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -2148,7 +2148,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -2324,7 +2324,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2479,7 +2479,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -2656,7 +2656,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2929,7 +2929,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -3098,7 +3098,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3177,7 +3177,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -3298,7 +3298,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -3430,7 +3430,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -3559,7 +3559,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json index 20a3f477..2f0eabd7 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/asyncapi.json @@ -70,7 +70,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -205,7 +205,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -355,7 +355,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -527,7 +527,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -677,7 +677,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -827,7 +827,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -994,7 +994,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1149,7 +1149,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -1301,7 +1301,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1453,7 +1453,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -1603,7 +1603,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -1775,7 +1775,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1925,7 +1925,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -2075,7 +2075,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -2242,7 +2242,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2397,7 +2397,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -2575,7 +2575,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2847,7 +2847,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -3007,7 +3007,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3086,7 +3086,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -3208,7 +3208,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -3339,7 +3339,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -3459,7 +3459,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json index d8b20fb6..16eab19f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - extended.json @@ -66,7 +66,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -194,7 +194,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -358,7 +358,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -488,7 +488,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -616,7 +616,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -777,7 +777,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -912,7 +912,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json index cce8158c..6048e8fc 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem - wrongly extended.json @@ -92,7 +92,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -238,7 +238,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -406,7 +406,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -556,7 +556,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -702,7 +702,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -865,7 +865,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1020,7 +1020,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json index 7dd50eb9..5f009d24 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/channelItem.json @@ -92,7 +92,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -238,7 +238,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -406,7 +406,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -556,7 +556,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -702,7 +702,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -865,7 +865,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1020,7 +1020,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json index 77220e6e..4c79ef7c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - extended.json @@ -97,7 +97,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json index 29a319d2..a45cbeae 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message - wrongly extended.json @@ -106,7 +106,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json index 9cacd1cf..2185c960 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/message.json @@ -106,7 +106,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json index 34919486..00c91ae8 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - extended.json @@ -86,7 +86,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json index efd0a26e..e4a0dfaf 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait - wrongly extended.json @@ -95,7 +95,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json index 5e7c0e68..071aa8ff 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageTrait.json @@ -95,7 +95,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadArrayOfSchemas.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadArrayOfSchemas.json index 33dc7425..e52c6d78 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadArrayOfSchemas.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadArrayOfSchemas.json @@ -4,7 +4,7 @@ "key": { "type": "string" }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" } }, "payload": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadJsonSchema.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadJsonSchema.json index e8c084f3..5aed86ef 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadJsonSchema.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/messageWithArrayPayloadJsonSchema.json @@ -4,7 +4,7 @@ "key": { "type": "string" }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" } }, "payload": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json index aed9c246..4e6f3bcb 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/message/oneOfMessages.json @@ -111,7 +111,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json index a45ae46c..07cdaa73 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - extended.json @@ -63,7 +63,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -191,7 +191,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -352,7 +352,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json index 0d5465ed..dcb6313b 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message - wrongly extended.json @@ -88,7 +88,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -235,7 +235,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -397,7 +397,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json index f701d24d..1f3510d5 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with message.json @@ -87,7 +87,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -233,7 +233,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -396,7 +396,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json index 3b0bfe5c..3de27985 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - extended.json @@ -63,7 +63,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -191,7 +191,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -355,7 +355,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json index 72b66f9c..8b10b59e 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message - wrongly extended.json @@ -87,7 +87,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -233,7 +233,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -401,7 +401,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json index 5fb48f56..8e1dc9d9 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with oneOf message.json @@ -87,7 +87,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -233,7 +233,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -401,7 +401,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json index 72b07192..0008d12c 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - extended.json @@ -63,7 +63,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -191,7 +191,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json index 3d286bc6..ecc52754 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message - wrongly extended.json @@ -87,7 +87,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -233,7 +233,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json index 7cd5dd0e..4c2767d3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operation with reference to message.json @@ -87,7 +87,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -233,7 +233,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json index 42c09818..d3b61a1f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - extended.json @@ -63,7 +63,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json index d150df91..1f409d8d 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait - wrongly extended.json @@ -87,7 +87,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json index 1120bc65..519b5700 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/channel/operation/operationTrait.json @@ -87,7 +87,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json index 4b5ca7ec..557a5a74 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - extended.json @@ -83,7 +83,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -219,7 +219,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -347,7 +347,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -511,7 +511,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -641,7 +641,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -769,7 +769,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -930,7 +930,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1065,7 +1065,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -1242,7 +1242,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1495,7 +1495,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -1650,7 +1650,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1743,7 +1743,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -1856,7 +1856,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -1977,7 +1977,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -2090,7 +2090,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json index a3bc9cbd..9a9eb212 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components - wrongly extended.json @@ -81,7 +81,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -234,7 +234,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -381,7 +381,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -548,7 +548,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -699,7 +699,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -846,7 +846,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -1008,7 +1008,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1163,7 +1163,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -1340,7 +1340,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1613,7 +1613,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -1768,7 +1768,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1847,7 +1847,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1969,7 +1969,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -2101,7 +2101,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -2216,7 +2216,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json index e8cf4cab..c1bb82c3 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/components/components.json @@ -81,7 +81,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -233,7 +233,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -379,7 +379,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -547,7 +547,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -697,7 +697,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -843,7 +843,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -1006,7 +1006,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1161,7 +1161,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -1339,7 +1339,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1611,7 +1611,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -1767,7 +1767,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1846,7 +1846,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -1968,7 +1968,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -2099,7 +2099,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -2215,7 +2215,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json index bf8b501e..a2b83b7f 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - extended.json @@ -52,7 +52,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - wrongly extended.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - wrongly extended.json index a27abfe8..ec5079c5 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server - wrongly extended.json @@ -50,7 +50,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server.json b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server.json index 3ccb20e2..4f34e900 100644 --- a/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server.json +++ b/asyncapi-core/src/test/resources/json/v2/2.6.0/model/server/server.json @@ -50,7 +50,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json index 5009498a..8a4b3aaf 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - extended.json @@ -98,7 +98,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -221,7 +221,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -390,7 +390,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -524,7 +524,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -658,7 +658,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -806,7 +806,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -979,7 +979,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1113,7 +1113,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1247,7 +1247,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1395,7 +1395,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1547,7 +1547,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1681,7 +1681,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1815,7 +1815,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1963,7 +1963,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2111,7 +2111,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -2319,7 +2319,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2453,7 +2453,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2587,7 +2587,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2735,7 +2735,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2908,7 +2908,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3042,7 +3042,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3176,7 +3176,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3324,7 +3324,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3476,7 +3476,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3610,7 +3610,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3744,7 +3744,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3892,7 +3892,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -4040,7 +4040,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -4215,7 +4215,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4347,7 +4347,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4478,7 +4478,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4640,7 +4640,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4772,7 +4772,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4903,7 +4903,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -5084,7 +5084,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -5264,7 +5264,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5398,7 +5398,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5532,7 +5532,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5680,7 +5680,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5853,7 +5853,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5987,7 +5987,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6121,7 +6121,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6269,7 +6269,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6421,7 +6421,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6555,7 +6555,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6689,7 +6689,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6837,7 +6837,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6985,7 +6985,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -7193,7 +7193,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -7327,7 +7327,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -7461,7 +7461,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -7609,7 +7609,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -7782,7 +7782,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -7916,7 +7916,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -8050,7 +8050,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -8198,7 +8198,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -8350,7 +8350,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -8484,7 +8484,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -8618,7 +8618,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -8766,7 +8766,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -8914,7 +8914,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -9089,7 +9089,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -9221,7 +9221,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -9352,7 +9352,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -9514,7 +9514,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -9646,7 +9646,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -9777,7 +9777,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -9986,7 +9986,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -10120,7 +10120,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -10254,7 +10254,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -10402,7 +10402,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -10575,7 +10575,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -10709,7 +10709,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -10843,7 +10843,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -10991,7 +10991,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -11143,7 +11143,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -11277,7 +11277,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -11411,7 +11411,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -11559,7 +11559,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -11835,7 +11835,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -11967,7 +11967,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -12109,7 +12109,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -12257,7 +12257,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -12393,7 +12393,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -12498,7 +12498,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -12611,7 +12611,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -12732,7 +12732,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -12845,7 +12845,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - wrongly extended.json index 3bca49ed..12ec5675 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi - wrongly extended.json @@ -373,7 +373,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -522,7 +522,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -660,7 +660,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -811,7 +811,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -976,7 +976,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1125,7 +1125,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1263,7 +1263,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1414,7 +1414,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1557,7 +1557,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1706,7 +1706,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1844,7 +1844,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1995,7 +1995,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2140,7 +2140,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -2367,7 +2367,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2516,7 +2516,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2654,7 +2654,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2805,7 +2805,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2970,7 +2970,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3119,7 +3119,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3257,7 +3257,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3408,7 +3408,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3551,7 +3551,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3700,7 +3700,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3838,7 +3838,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3989,7 +3989,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -4134,7 +4134,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -4328,7 +4328,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4492,7 +4492,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4655,7 +4655,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4856,7 +4856,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5020,7 +5020,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5183,7 +5183,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5564,7 +5564,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5713,7 +5713,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5851,7 +5851,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6002,7 +6002,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6167,7 +6167,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6316,7 +6316,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6454,7 +6454,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6605,7 +6605,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6748,7 +6748,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6897,7 +6897,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7035,7 +7035,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7186,7 +7186,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7331,7 +7331,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -7558,7 +7558,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7707,7 +7707,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7845,7 +7845,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7996,7 +7996,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8161,7 +8161,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8310,7 +8310,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8448,7 +8448,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8599,7 +8599,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8742,7 +8742,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8891,7 +8891,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -9029,7 +9029,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -9180,7 +9180,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -9325,7 +9325,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -9519,7 +9519,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -9683,7 +9683,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -9846,7 +9846,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -10047,7 +10047,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -10211,7 +10211,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -10374,7 +10374,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -10622,7 +10622,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -10771,7 +10771,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -10909,7 +10909,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11060,7 +11060,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11225,7 +11225,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11374,7 +11374,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11512,7 +11512,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11663,7 +11663,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11806,7 +11806,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11955,7 +11955,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -12093,7 +12093,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -12244,7 +12244,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -12530,7 +12530,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -12693,7 +12693,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -12860,7 +12860,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -13011,7 +13011,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -13149,7 +13149,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -13228,7 +13228,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -13349,7 +13349,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -13481,7 +13481,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -13610,7 +13610,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json index 050a9b53..3c9e7e6c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/asyncapi.json @@ -96,7 +96,7 @@ "kafka" : { "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -199,7 +199,7 @@ "kafka" : { "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -376,7 +376,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -526,7 +526,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -665,7 +665,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -817,7 +817,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -983,7 +983,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1133,7 +1133,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1272,7 +1272,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1424,7 +1424,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1568,7 +1568,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1718,7 +1718,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1857,7 +1857,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2009,7 +2009,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2154,7 +2154,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -2382,7 +2382,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2532,7 +2532,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2671,7 +2671,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2823,7 +2823,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2989,7 +2989,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3139,7 +3139,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3278,7 +3278,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3430,7 +3430,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3574,7 +3574,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3724,7 +3724,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3863,7 +3863,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -4015,7 +4015,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -4160,7 +4160,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -4353,7 +4353,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4506,7 +4506,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4658,7 +4658,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4848,7 +4848,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5001,7 +5001,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5153,7 +5153,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5332,7 +5332,7 @@ "kafka" : { "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -5526,7 +5526,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5676,7 +5676,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5815,7 +5815,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5967,7 +5967,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6133,7 +6133,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6283,7 +6283,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6422,7 +6422,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6574,7 +6574,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6718,7 +6718,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6868,7 +6868,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7007,7 +7007,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7159,7 +7159,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7304,7 +7304,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -7532,7 +7532,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7682,7 +7682,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7821,7 +7821,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7973,7 +7973,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8139,7 +8139,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8289,7 +8289,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8428,7 +8428,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8580,7 +8580,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8724,7 +8724,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -8874,7 +8874,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -9013,7 +9013,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -9165,7 +9165,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -9310,7 +9310,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -9503,7 +9503,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -9656,7 +9656,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -9808,7 +9808,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -9998,7 +9998,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -10151,7 +10151,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -10303,7 +10303,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -10542,7 +10542,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -10692,7 +10692,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -10831,7 +10831,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -10983,7 +10983,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11149,7 +11149,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11299,7 +11299,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11438,7 +11438,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11590,7 +11590,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11734,7 +11734,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -11884,7 +11884,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -12023,7 +12023,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -12175,7 +12175,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -12460,7 +12460,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -12612,7 +12612,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -12770,7 +12770,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -12922,7 +12922,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -13061,7 +13061,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -13140,7 +13140,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -13262,7 +13262,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -13393,7 +13393,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -13513,7 +13513,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json index c06efe37..688810f9 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - extended.json @@ -110,7 +110,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -244,7 +244,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -378,7 +378,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -526,7 +526,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -699,7 +699,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -833,7 +833,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -967,7 +967,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1115,7 +1115,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1267,7 +1267,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1401,7 +1401,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1535,7 +1535,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1683,7 +1683,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1831,7 +1831,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - wrongly extended.json index 8486e6b1..d3c2479f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel - wrongly extended.json @@ -133,7 +133,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -282,7 +282,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -420,7 +420,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -571,7 +571,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -736,7 +736,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -885,7 +885,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1023,7 +1023,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1174,7 +1174,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1317,7 +1317,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1466,7 +1466,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1604,7 +1604,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1755,7 +1755,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1900,7 +1900,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json index a9e169a2..a6ecfaba 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - extended.json @@ -110,7 +110,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -244,7 +244,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -378,7 +378,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -526,7 +526,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -699,7 +699,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -833,7 +833,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -967,7 +967,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1115,7 +1115,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1267,7 +1267,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1401,7 +1401,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1535,7 +1535,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1683,7 +1683,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1831,7 +1831,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - wrongly extended.json index 4d0ba6f3..3e3005fa 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference - wrongly extended.json @@ -134,7 +134,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -284,7 +284,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -423,7 +423,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -575,7 +575,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -741,7 +741,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -891,7 +891,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1030,7 +1030,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1182,7 +1182,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1326,7 +1326,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1476,7 +1476,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1615,7 +1615,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1767,7 +1767,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1912,7 +1912,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference.json index ec2082bc..c37f98db 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel with reference.json @@ -134,7 +134,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -284,7 +284,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -423,7 +423,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -575,7 +575,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -741,7 +741,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -891,7 +891,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1030,7 +1030,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1182,7 +1182,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1326,7 +1326,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1476,7 +1476,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1615,7 +1615,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1767,7 +1767,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1912,7 +1912,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel.json index 4994cf23..df27d3b1 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/channel.json @@ -134,7 +134,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -284,7 +284,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -423,7 +423,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -575,7 +575,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -741,7 +741,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -891,7 +891,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1030,7 +1030,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1182,7 +1182,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1326,7 +1326,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1476,7 +1476,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1615,7 +1615,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1767,7 +1767,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1912,7 +1912,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json index c23f50d6..0f9ffafd 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - extended.json @@ -82,7 +82,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -216,7 +216,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -350,7 +350,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -498,7 +498,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - wrongly extended.json index e4b16f0f..b962a2a4 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message - wrongly extended.json @@ -102,7 +102,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -252,7 +252,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -391,7 +391,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -543,7 +543,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json index 28a56f16..b034827c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - extended.json @@ -87,7 +87,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -221,7 +221,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -355,7 +355,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -503,7 +503,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - wrongly extended.json index f63a9e27..e2297e0d 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2 - wrongly extended.json @@ -107,7 +107,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -257,7 +257,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -396,7 +396,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -548,7 +548,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2.json index ac237541..0433105c 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message 2.json @@ -107,7 +107,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -257,7 +257,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -396,7 +396,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -548,7 +548,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json index 1b9b4033..71d0422f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - extended.json @@ -65,7 +65,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -199,7 +199,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -333,7 +333,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -481,7 +481,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - wrongly extended.json index c5407278..5d169d07 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference - wrongly extended.json @@ -85,7 +85,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -235,7 +235,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -374,7 +374,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -526,7 +526,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference.json index b0d5abf0..4ff268fd 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message with reference.json @@ -85,7 +85,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -235,7 +235,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -374,7 +374,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -526,7 +526,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message.json index 835353f5..8e884dba 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/message.json @@ -102,7 +102,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -252,7 +252,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -391,7 +391,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -543,7 +543,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json index e36b2353..de9b4d34 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - extended.json @@ -73,7 +73,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - wrongly extended.json index 0bad188e..a252d136 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait - wrongly extended.json @@ -93,7 +93,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json index 6b09cb9f..9265b50d 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2 - extended.json @@ -75,7 +75,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2.json index e9150450..d35bc7af 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait 2.json @@ -95,7 +95,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json index 98687e18..1f833208 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - extended.json @@ -62,7 +62,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - wrongly extended.json index e82e3cfe..dd93c981 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference - wrongly extended.json @@ -82,7 +82,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference.json index 74b651de..d7f20cc8 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait with reference.json @@ -82,7 +82,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait.json index 5967cb3a..a14f59bb 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageTrait.json @@ -93,7 +93,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageWithArrayPayloadArrayOfSchemas.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageWithArrayPayloadArrayOfSchemas.json index 33dc7425..e52c6d78 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageWithArrayPayloadArrayOfSchemas.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageWithArrayPayloadArrayOfSchemas.json @@ -4,7 +4,7 @@ "key": { "type": "string" }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" } }, "payload": { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageWithArrayPayloadJsonSchema.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageWithArrayPayloadJsonSchema.json index e8c084f3..5aed86ef 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageWithArrayPayloadJsonSchema.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/channel/message/messageWithArrayPayloadJsonSchema.json @@ -4,7 +4,7 @@ "key": { "type": "string" }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" } }, "payload": { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json index 0ddd7166..045b6393 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - extended.json @@ -100,7 +100,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -280,7 +280,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -414,7 +414,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -548,7 +548,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -696,7 +696,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -869,7 +869,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1003,7 +1003,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1137,7 +1137,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1285,7 +1285,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1437,7 +1437,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1571,7 +1571,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1705,7 +1705,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -1853,7 +1853,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2001,7 +2001,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -2209,7 +2209,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2343,7 +2343,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2477,7 +2477,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2625,7 +2625,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2798,7 +2798,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -2932,7 +2932,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3066,7 +3066,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3214,7 +3214,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3366,7 +3366,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3500,7 +3500,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3634,7 +3634,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3782,7 +3782,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -3930,7 +3930,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -4105,7 +4105,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4237,7 +4237,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4368,7 +4368,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4530,7 +4530,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4662,7 +4662,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -4793,7 +4793,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -5002,7 +5002,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5136,7 +5136,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5270,7 +5270,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5418,7 +5418,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5591,7 +5591,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5725,7 +5725,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -5859,7 +5859,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6007,7 +6007,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6159,7 +6159,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6293,7 +6293,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6427,7 +6427,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6575,7 +6575,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -6851,7 +6851,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -6983,7 +6983,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -7125,7 +7125,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -7273,7 +7273,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -7409,7 +7409,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] @@ -7514,7 +7514,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, @@ -7627,7 +7627,7 @@ "$ref" : "#/components/channelBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "topic" : "my-specific-topic-name", "partitions" : 20, "replicas" : 3, @@ -7748,7 +7748,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -7861,7 +7861,7 @@ "$ref" : "#/components/messageBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "key" : { "type" : "string", "enum" : [ "myKey" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - wrongly extended.json index dcab9a3a..1181d8e3 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components - wrongly extended.json @@ -288,7 +288,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -437,7 +437,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -575,7 +575,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -726,7 +726,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -891,7 +891,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1040,7 +1040,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1178,7 +1178,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1329,7 +1329,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1472,7 +1472,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1621,7 +1621,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1759,7 +1759,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1910,7 +1910,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2055,7 +2055,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -2282,7 +2282,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2431,7 +2431,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2569,7 +2569,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2720,7 +2720,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2885,7 +2885,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3034,7 +3034,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3172,7 +3172,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3323,7 +3323,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3466,7 +3466,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3615,7 +3615,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3753,7 +3753,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3904,7 +3904,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -4049,7 +4049,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -4243,7 +4243,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4407,7 +4407,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4570,7 +4570,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4771,7 +4771,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4935,7 +4935,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5098,7 +5098,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5360,7 +5360,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5509,7 +5509,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5647,7 +5647,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5798,7 +5798,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5963,7 +5963,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6112,7 +6112,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6250,7 +6250,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6401,7 +6401,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6544,7 +6544,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6693,7 +6693,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6831,7 +6831,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6982,7 +6982,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7268,7 +7268,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -7431,7 +7431,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -7598,7 +7598,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7749,7 +7749,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7887,7 +7887,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7966,7 +7966,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -8087,7 +8087,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -8219,7 +8219,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -8348,7 +8348,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json index 20d6964f..6bd1720b 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/components/components.json @@ -96,7 +96,7 @@ "kafka" : { "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { @@ -290,7 +290,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -440,7 +440,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -579,7 +579,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -731,7 +731,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -897,7 +897,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1047,7 +1047,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1186,7 +1186,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1338,7 +1338,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1482,7 +1482,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1632,7 +1632,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1771,7 +1771,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -1923,7 +1923,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2068,7 +2068,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -2296,7 +2296,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2446,7 +2446,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2585,7 +2585,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2737,7 +2737,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -2903,7 +2903,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3053,7 +3053,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3192,7 +3192,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3344,7 +3344,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3488,7 +3488,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3638,7 +3638,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3777,7 +3777,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -3929,7 +3929,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -4074,7 +4074,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -4267,7 +4267,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4420,7 +4420,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4572,7 +4572,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4762,7 +4762,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -4915,7 +4915,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5067,7 +5067,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -5306,7 +5306,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5456,7 +5456,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5595,7 +5595,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5747,7 +5747,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -5913,7 +5913,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6063,7 +6063,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6202,7 +6202,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6354,7 +6354,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6498,7 +6498,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6648,7 +6648,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6787,7 +6787,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -6939,7 +6939,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7224,7 +7224,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -7376,7 +7376,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -7534,7 +7534,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7686,7 +7686,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7825,7 +7825,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" @@ -7904,7 +7904,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { @@ -8026,7 +8026,7 @@ "delete.retention.ms": 86400000, "max.message.bytes": 1048588 }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/channelBindings/mercure" @@ -8157,7 +8157,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -8277,7 +8277,7 @@ "schemaIdLocation": "payload", "schemaIdPayloadEncoding": "apicurio-new", "schemaLookupStrategy": "TopicIdStrategy", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/messageBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json index 43c83656..0c46de6e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - extended.json @@ -73,7 +73,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -205,7 +205,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -336,7 +336,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json index 1f42bdcf..16e0ae0d 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation - wrongly extended.json @@ -95,7 +95,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -244,7 +244,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -392,7 +392,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json index cfd2161f..18e66024 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - extended.json @@ -72,7 +72,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -204,7 +204,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] @@ -335,7 +335,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json index 0728c723..3977d207 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference - wrongly extended.json @@ -94,7 +94,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -243,7 +243,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -405,7 +405,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json index 59de4dba..f8090f32 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation with reference.json @@ -94,7 +94,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -243,7 +243,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -391,7 +391,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json index 36d0173f..525766ba 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operation.json @@ -95,7 +95,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -244,7 +244,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" @@ -392,7 +392,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json index 8d1c60dd..31fc0894 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - extended.json @@ -69,7 +69,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json index ee5beb12..1712ed09 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait - wrongly extended.json @@ -93,7 +93,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json index c9f51eb2..ac0b9156 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - extended.json @@ -68,7 +68,7 @@ "$ref" : "#/components/operationBindings/jms" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "groupId" : { "type" : "string", "enum" : [ "myGroupId" ] diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json index 380a10a5..7dfc2277 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference - wrongly extended.json @@ -92,7 +92,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json index 6411d662..94eab5c0 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait with reference.json @@ -92,7 +92,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json index e3a29fa9..6ccf697e 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/operation/operationTrait.json @@ -93,7 +93,7 @@ "myClientId" ] }, - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": { "$ref": "#/components/operationBindings/mercure" diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json index 75e237a0..10593fa7 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - extended.json @@ -66,7 +66,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - wrongly extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - wrongly extended.json index 7abed521..28e439a5 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - wrongly extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server - wrongly extended.json @@ -66,7 +66,7 @@ "kafka": { "schemaRegistryUrl": "https://my-schema-registry.com", "schemaRegistryVendor": "confluent", - "bindingVersion": "0.4.0" + "bindingVersion": "0.5.0" }, "mercure": {}, "mqtt": { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json index 15361c71..1eac37d6 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference - extended.json @@ -69,7 +69,7 @@ "jmsConnectionFactory" : "" }, "kafka" : { - "bindingVersion" : "0.4.0", + "bindingVersion" : "0.5.0", "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent" }, diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference.json index 95b250d1..2dd20af6 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server with reference.json @@ -65,7 +65,7 @@ "kafka" : { "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { diff --git a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server.json b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server.json index f423959e..062e666f 100644 --- a/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server.json +++ b/asyncapi-core/src/test/resources/json/v3/3.0.0/model/server/server.json @@ -62,7 +62,7 @@ "kafka" : { "schemaRegistryUrl" : "https://my-schema-registry.com", "schemaRegistryVendor" : "confluent", - "bindingVersion" : "0.4.0" + "bindingVersion" : "0.5.0" }, "mercure" : { }, "mqtt" : { From 05ab92e0b92cc0120aa16e319c39397e25fb42f9 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 21:10:10 +0400 Subject: [PATCH 106/141] docs(bindings): package-info --- .../com/asyncapi/bindings/package-info.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/bindings/package-info.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/package-info.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/package-info.java new file mode 100644 index 00000000..dd16b3b8 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/package-info.java @@ -0,0 +1,23 @@ +/** + * This module provides bindings to describe protocol-specific things: + *

    + *
  • Channel
    • + *
  • Message
    • + *
  • Operation
    • + *
  • Server
    • + *
+ * + *
+ * A "binding" (or "protocol binding") is a mechanism to define protocol-specific information. + *

+ * Therefore, a protocol binding MUST define protocol-specific information only. + * + * @see AsyncAPI Bindings + * @see AsyncAPI Channel Bindings + * @see AsyncAPI Message Bindings + * @see AsyncAPI Operation Bindings + * @see AsyncAPI Server Bindings + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +package com.asyncapi.bindings; \ No newline at end of file From 45b5ece98ccd325959b5c1803e40c74e58a1145d Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 21:34:54 +0400 Subject: [PATCH 107/141] docs(bindings): docs --- .../java/com/asyncapi/bindings/BindingsMapDeserializer.java | 3 +++ .../src/main/java/com/asyncapi/bindings/ChannelBinding.java | 2 +- .../com/asyncapi/bindings/ChannelBindingsDeserializer.java | 1 + .../src/main/java/com/asyncapi/bindings/MessageBinding.java | 5 +++++ .../com/asyncapi/bindings/MessageBindingsDeserializer.java | 1 + .../main/java/com/asyncapi/bindings/OperationBinding.java | 2 +- .../com/asyncapi/bindings/OperationBindingsDeserializer.java | 2 +- .../src/main/java/com/asyncapi/bindings/ServerBinding.java | 2 +- .../com/asyncapi/bindings/ServerBindingsDeserializer.java | 2 +- 9 files changed, 15 insertions(+), 5 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/BindingsMapDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/BindingsMapDeserializer.java index 8e391b6e..ab5d3f38 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/BindingsMapDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/BindingsMapDeserializer.java @@ -13,6 +13,9 @@ /** * Deserializes AsyncAPI bindings map. + * + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ public abstract class BindingsMapDeserializer extends JsonDeserializer> { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java index 5cf318f7..dbd6e2be 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBinding.java @@ -14,7 +14,7 @@ * @see Specification Extensions * @see Channel Binding * @author Pavel Bodiachevskii - * @version 3.0.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java index a0575f79..72c06300 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ChannelBindingsDeserializer.java @@ -30,6 +30,7 @@ * Serializes channel bindings map. * * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ public class ChannelBindingsDeserializer extends BindingsMapDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java index 1bf4830a..5cedaa93 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBinding.java @@ -8,8 +8,13 @@ /** * Describes AsyncAPI message binding. + *

+ * This object MAY be extended with {@link ExtendableObject}. * + * @see Specification Extensions + * @see Message Binding * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java index 5014f537..c3b8af0a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/MessageBindingsDeserializer.java @@ -30,6 +30,7 @@ * Serializes message bindings map. * * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ public class MessageBindingsDeserializer extends BindingsMapDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java index 530e057e..0b9ba524 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBinding.java @@ -14,7 +14,7 @@ * @see Specification Extensions * @see Operation Binding * @author Pavel Bodiachevskii - * @version 3.0.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java index d2d989b4..bffe1602 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/OperationBindingsDeserializer.java @@ -29,8 +29,8 @@ /** * Serializes operation bindings map. * - * @version 3.0.0 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ public class OperationBindingsDeserializer extends BindingsMapDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java index 38092ed2..eb378ec2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBinding.java @@ -14,7 +14,7 @@ * @see Specification Extensions * @see Server Binding * @author Pavel Bodiachevskii - * @version 3.0.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java index 7aef1c2b..ae7157bd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ServerBindingsDeserializer.java @@ -29,8 +29,8 @@ /** * Serializes server bindings map. * - * @version 3.0.0 * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ public class ServerBindingsDeserializer extends BindingsMapDeserializer { From 0d2749557f1b711e09b9b701ffff742443ced340 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 21:43:55 +0400 Subject: [PATCH 108/141] docs(bindings): AMQP docs --- .../java/com/asyncapi/bindings/amqp/AMQPChannelBinding.java | 3 ++- .../java/com/asyncapi/bindings/amqp/AMQPMessageBinding.java | 3 ++- .../com/asyncapi/bindings/amqp/AMQPOperationBinding.java | 3 ++- .../java/com/asyncapi/bindings/amqp/AMQPServerBinding.java | 3 ++- .../bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java | 4 +++- .../bindings/amqp/v0/_1_0/channel/AMQPChannelType.java | 4 +++- .../channel/exchange/AMQPChannelExchangeProperties.java | 4 +++- .../v0/_1_0/channel/exchange/AMQPChannelExchangeType.java | 4 +++- .../v0/_1_0/channel/queue/AMQPChannelQueueProperties.java | 4 +++- .../bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java | 4 +++- .../amqp/v0/_1_0/operation/AMQPOperationBinding.java | 4 +++- .../bindings/amqp/v0/_1_0/server/AMQPServerBinding.java | 6 +++--- .../bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java | 4 +++- .../bindings/amqp/v0/_2_0/channel/AMQPChannelType.java | 4 +++- .../channel/exchange/AMQPChannelExchangeProperties.java | 4 +++- .../v0/_2_0/channel/exchange/AMQPChannelExchangeType.java | 4 +++- .../v0/_2_0/channel/queue/AMQPChannelQueueProperties.java | 4 +++- .../bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java | 4 +++- .../amqp/v0/_2_0/operation/AMQPOperationBinding.java | 4 +++- .../bindings/amqp/v0/_2_0/server/AMQPServerBinding.java | 6 +++--- .../bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java | 4 +++- .../bindings/amqp/v0/_3_0/channel/AMQPChannelType.java | 4 +++- .../channel/exchange/AMQPChannelExchangeProperties.java | 4 +++- .../v0/_3_0/channel/exchange/AMQPChannelExchangeType.java | 4 +++- .../v0/_3_0/channel/queue/AMQPChannelQueueProperties.java | 4 +++- .../bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java | 4 +++- .../amqp/v0/_3_0/operation/AMQPOperationBinding.java | 4 +++- .../bindings/amqp/v0/_3_0/server/AMQPServerBinding.java | 6 +++--- 28 files changed, 80 insertions(+), 34 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPChannelBinding.java index eedcef70..2f151e52 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPChannelBinding.java @@ -11,9 +11,10 @@ *

* Contains information about the channel representation in AMQP. * - * @since 1.0.0-RC2 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPMessageBinding.java index 6dfa065f..66001f8d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPMessageBinding.java @@ -11,9 +11,10 @@ *

* Contains information about the message representation in AMQP. * - * @since 1.0.0-RC2 * @see AMQP message binding + * @see AMQP * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPOperationBinding.java index a6b18f00..5e306f90 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPOperationBinding.java @@ -11,9 +11,10 @@ *

* Contains information about the operation representation in AMQP. * - * @since 1.0.0-RC2 * @see AMQP operation binding + * @see AMQP * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPServerBinding.java index ffca0b47..f605b79b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/AMQPServerBinding.java @@ -11,9 +11,10 @@ *

* Contains information about the server representation in AMQP. * - * @since 1.0.0-RC2 * @see AMQP server binding + * @see AMQP * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java index 2e785b2e..7caf5bd3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java @@ -14,9 +14,11 @@ *

* Contains information about the channel representation in AMQP. * - * @version 0.1.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelType.java index 3bca793b..e0214410 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelType.java @@ -8,9 +8,11 @@ *

* Contains information about the type of channel in AMQP. * - * @version 0.1.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ public enum AMQPChannelType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java index 16aa431e..158cb4bc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java @@ -11,9 +11,11 @@ *

* Contains information about the channel exchange properties in AMQP. * - * @version 0.1.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeType.java index 8531ba38..e3966497 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeType.java @@ -8,9 +8,11 @@ *

* Contains information about the channel exchange type in AMQP. * - * @version 0.1.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonClassDescription("Describes AMQP 0-9-1 channel exchange type.") public enum AMQPChannelExchangeType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java index fc2d602b..344abdba 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java @@ -11,9 +11,11 @@ *

* Contains information about the queue exchange properties in AMQP. * - * @version 0.1.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java index 64f69ad0..74a05fc7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the message representation in AMQP. * - * @version 0.1.0 * @see AMQP message binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java index 46c6ea54..93828e19 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java @@ -13,9 +13,11 @@ *

* Contains information about the operation representation in AMQP. * - * @version 0.1.0 * @see AMQP operation binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/server/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/server/AMQPServerBinding.java index 735e4271..1347bdc4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/server/AMQPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/server/AMQPServerBinding.java @@ -7,12 +7,12 @@ /** * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes AMQP 0-9-1 server binding. * - * @version 0.1.0 * @see AMQP server binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java index 5f5c552e..96b3af38 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java @@ -14,9 +14,11 @@ *

* Contains information about the channel representation in AMQP. * - * @version 0.2.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelType.java index 1dce3e40..6df297bb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelType.java @@ -8,9 +8,11 @@ *

* Contains information about the type of channel in AMQP. * - * @version 0.2.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ public enum AMQPChannelType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java index 4582c581..2d74bbc1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java @@ -11,9 +11,11 @@ *

* Contains information about the channel exchange properties in AMQP. * - * @version 0.2.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeType.java index 4d9af396..c6c1c4de 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeType.java @@ -8,9 +8,11 @@ *

* Contains information about the channel exchange type in AMQP. * - * @version 0.2.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @JsonClassDescription("Describes AMQP 0-9-1 channel exchange type.") public enum AMQPChannelExchangeType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java index f31f3762..720f7dd1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java @@ -11,9 +11,11 @@ *

* Contains information about the queue exchange properties in AMQP. * - * @version 0.2.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java index fcc8e2c0..476b4755 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the message representation in AMQP. * - * @version 0.2.0 * @see AMQP message binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java index a2e479fd..7b67847e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java @@ -13,9 +13,11 @@ *

* Contains information about the operation representation in AMQP. * - * @version 0.2.0 * @see AMQP operation binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java index 868088a0..305e7df9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/server/AMQPServerBinding.java @@ -7,12 +7,12 @@ /** * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes AMQP 0-9-1 server binding. * - * @version 0.2.0 * @see AMQP server binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java index d1925075..fc4ef8dc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java @@ -14,9 +14,11 @@ *

* Contains information about the channel representation in AMQP. * - * @version 0.3.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelType.java index a270537d..9e5aeed9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelType.java @@ -8,9 +8,11 @@ *

* Contains information about the type of channel in AMQP. * - * @version 0.3.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ public enum AMQPChannelType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java index aa0476ba..076e598e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java @@ -11,9 +11,11 @@ *

* Contains information about the channel exchange properties in AMQP. * - * @version 0.3.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeType.java index 7abf4fc8..a314b112 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeType.java @@ -8,9 +8,11 @@ *

* Contains information about the channel exchange type in AMQP. * - * @version 0.3.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @JsonClassDescription("Describes AMQP 0-9-1 channel exchange type.") public enum AMQPChannelExchangeType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java index e67c88a7..b4489147 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java @@ -11,9 +11,11 @@ *

* Contains information about the queue exchange properties in AMQP. * - * @version 0.3.0 * @see AMQP channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java index 199cee94..0e83bcf2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the message representation in AMQP. * - * @version 0.3.0 * @see AMQP message binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java index e49efe4b..96671071 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java @@ -13,9 +13,11 @@ *

* Contains information about the operation representation in AMQP. * - * @version 0.3.0 * @see AMQP operation binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/server/AMQPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/server/AMQPServerBinding.java index c358e110..3afea40f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/server/AMQPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/server/AMQPServerBinding.java @@ -7,12 +7,12 @@ /** * This class MUST NOT contain any properties. Its name is reserved for future use. - *

- * Describes AMQP 0-9-1 server binding. * - * @version 0.3.0 * @see AMQP server binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor From 86243902e81b794396c5f76dbe2828c0662e7764 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 21:56:31 +0400 Subject: [PATCH 109/141] docs(bindings): AMQP1 docs --- .../com/asyncapi/bindings/amqp1/AMQP1ChannelBinding.java | 6 +++--- .../com/asyncapi/bindings/amqp1/AMQP1MessageBinding.java | 6 +++--- .../com/asyncapi/bindings/amqp1/AMQP1OperationBinding.java | 6 +++--- .../com/asyncapi/bindings/amqp1/AMQP1ServerBinding.java | 6 +++--- .../bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java | 4 +++- .../bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java | 4 +++- .../amqp1/v0/_1_0/operation/AMQP1OperationBinding.java | 4 +++- .../bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java | 4 +++- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ChannelBinding.java index 8fc85d22..46f32db3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ChannelBinding.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes AMQP 1.0 channel binding. * - * @version 0.1.0 * @see AMQP 1.0 channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1MessageBinding.java index d3d64add..cdd91e95 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1MessageBinding.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes AMQP 1.0 message binding. * - * @version 0.1.0 * @see AMQP message binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1OperationBinding.java index 8f059a9d..82d62a19 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1OperationBinding.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes AMQP 1.0 operation binding. * - * @version 0.1.0 * @see AMQP operation binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ServerBinding.java index 13afc8c2..aa008765 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/AMQP1ServerBinding.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes AMQP 1.0 server binding. * - * @version 0.1.0 * @see AMQP server binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java index 8f3f0c83..91cbe858 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/channel/AMQP1ChannelBinding.java @@ -10,9 +10,11 @@ *

* Describes AMQP 1.0 channel binding. * - * @version 0.1.0 * @see AMQP 1.0 channel binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java index 81804da6..204a9083 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/message/AMQP1MessageBinding.java @@ -10,9 +10,11 @@ *

* Describes AMQP 1.0 message binding. * - * @version 0.1.0 * @see AMQP message binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java index 768aa45b..93e622e2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/operation/AMQP1OperationBinding.java @@ -10,9 +10,11 @@ *

* Describes AMQP 1.0 operation binding. * - * @version 0.1.0 * @see AMQP operation binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java index d1c816d1..ff31fdc1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp1/v0/_1_0/server/AMQP1ServerBinding.java @@ -10,9 +10,11 @@ *

* Describes AMQP 1.0 server binding. * - * @version 0.1.0 * @see AMQP server binding + * @see AMQP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor From ba9d774eb5c47fa67a3d9d95f1ccbad2cd2aea05 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 21:58:54 +0400 Subject: [PATCH 110/141] docs(bindings): Anypoint MQ docs --- .../bindings/anypointmq/AnypointMQChannelBinding.java | 4 +++- .../bindings/anypointmq/AnypointMQMessageBinding.java | 4 +++- .../bindings/anypointmq/AnypointMQOperationBinding.java | 6 ++++-- .../bindings/anypointmq/AnypointMQServerBinding.java | 6 ++++-- .../v0/_0_1/channel/AnypointMQChannelBinding.java | 4 +++- .../v0/_0_1/channel/AnypointMQChannelDestinationType.java | 4 +++- .../v0/_0_1/message/AnypointMQMessageBinding.java | 4 +++- .../v0/_0_1/operation/AnypointMQOperationBinding.java | 6 ++++-- .../anypointmq/v0/_0_1/server/AnypointMQServerBinding.java | 6 ++++-- 9 files changed, 31 insertions(+), 13 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java index afc70c96..2e27f1e7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java @@ -8,9 +8,11 @@ /** * Describes Anypoint MQ channel binding. * - * @version 0.0.1 * @see Anypoint MQ channel binding + * @see Anypoint MQ * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java index 5fc1c6e5..7fde460a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java @@ -9,9 +9,11 @@ /** * Describes Anypoint MQ message binding. * - * @version 0.0.1 * @see Anypoint MQ message binding + * @see Anypoint MQ * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java index 69e6ffba..21d14805 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java @@ -8,11 +8,13 @@ import lombok.NoArgsConstructor; /** - * Describes Anypoint MQ operation binding. + * Describes Anypoint MQ operation binding. * - * @version 0.0.1 * @see Anypoint MQ operation binding + * @see Anypoint MQ * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java index 2adf1caa..07fb1a21 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java @@ -8,11 +8,13 @@ import lombok.NoArgsConstructor; /** - * Describes Anypoint MQ server binding. + * Describes Anypoint MQ server binding. * - * @version 0.0.1 * @see Anypoint MQ server binding + * @see Anypoint MQ * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java index bb63f1b4..8076124b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java @@ -9,9 +9,11 @@ /** * Describes Anypoint MQ channel binding. * - * @version 0.0.1 * @see Anypoint MQ channel binding + * @see Anypoint MQ * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelDestinationType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelDestinationType.java index fb5c5977..c8e8b233 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelDestinationType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelDestinationType.java @@ -6,9 +6,11 @@ /** * Describes Anypoint MQ channel destination type. * - * @version 0.0.1 * @see Anypoint MQ channel binding + * @see Anypoint MQ * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @JsonClassDescription("Describes Anypoint MQ channel destination type.") public enum AnypointMQChannelDestinationType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java index 7ea75154..22890390 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java @@ -10,9 +10,11 @@ /** * Describes Anypoint MQ message binding. * - * @version 0.0.1 * @see Anypoint MQ message binding + * @see Anypoint MQ * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java index dc539f96..c5a29ce0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/operation/AnypointMQOperationBinding.java @@ -8,11 +8,13 @@ /** * This class MUST NOT contain any properties. Its name is reserved for future use. *

- * Describes Anypoint MQ operation binding. + * Describes Anypoint MQ operation binding. * - * @version 0.0.1 * @see Anypoint MQ operation binding + * @see Anypoint MQ * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java index e31ec742..78292eff 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/server/AnypointMQServerBinding.java @@ -8,11 +8,13 @@ /** * This class MUST NOT contain any properties. Its name is reserved for future use. *

- * Describes Anypoint MQ server binding. + * Describes Anypoint MQ server binding. * - * @version 0.0.1 * @see Anypoint MQ server binding + * @see Anypoint MQ * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor From 793cc93514e89498e7316a4a9be6cb9f446a6ccf Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:00:20 +0400 Subject: [PATCH 111/141] docs(bindings): Anypoint MQ docs --- .../asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java | 1 - .../asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java | 1 - .../asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java | 1 - .../asyncapi/bindings/anypointmq/AnypointMQServerBinding.java | 1 - 4 files changed, 4 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java index 2e27f1e7..b8dc4baf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQChannelBinding.java @@ -11,7 +11,6 @@ * @see Anypoint MQ channel binding * @see Anypoint MQ * @author Pavel Bodiachevskii - * @version 0.0.1 * @since 1.0.0-RC2 */ @JsonTypeInfo( diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java index 7fde460a..ba1bbadb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java @@ -12,7 +12,6 @@ * @see Anypoint MQ message binding * @see Anypoint MQ * @author Pavel Bodiachevskii - * @version 0.0.1 * @since 1.0.0-RC2 */ @JsonTypeInfo( diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java index 21d14805..0127d49f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java @@ -13,7 +13,6 @@ * @see Anypoint MQ operation binding * @see Anypoint MQ * @author Pavel Bodiachevskii - * @version 0.0.1 * @since 1.0.0-RC2 */ @JsonTypeInfo( diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java index 07fb1a21..202d8ff8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java @@ -13,7 +13,6 @@ * @see Anypoint MQ server binding * @see Anypoint MQ * @author Pavel Bodiachevskii - * @version 0.0.1 * @since 1.0.0-RC2 */ @JsonTypeInfo( From 485f4bee9c7a6f76aa287a7e85762a778e12e1f9 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:02:48 +0400 Subject: [PATCH 112/141] docs(bindings): Google Cloud Pub/Sub docs --- .../bindings/googlepubsub/GooglePubSubChannelBinding.java | 2 ++ .../bindings/googlepubsub/GooglePubSubMessageBinding.java | 2 ++ .../bindings/googlepubsub/GooglePubSubOperationBinding.java | 2 ++ .../bindings/googlepubsub/GooglePubSubServerBinding.java | 2 ++ .../v0/_1_0/channel/GooglePubSubChannelBinding.java | 4 +++- .../channel/GooglePubSubChannelMessageStoragePolicy.java | 4 +++- .../v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java | 5 +++++ .../v0/_1_0/message/GooglePubSubMessageBinding.java | 4 +++- .../v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java | 4 +++- .../message/GooglePubSubMessageSchemaDefinitionType.java | 4 +++- .../v0/_1_0/operation/GooglePubSubOperationBinding.java | 4 +++- .../v0/_1_0/server/GooglePubSubServerBinding.java | 4 +++- .../v0/_2_0/channel/GooglePubSubChannelBinding.java | 4 +++- .../channel/GooglePubSubChannelMessageStoragePolicy.java | 4 +++- .../v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java | 5 +++++ .../v0/_2_0/message/GooglePubSubMessageBinding.java | 4 +++- .../v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java | 4 +++- .../v0/_2_0/operation/GooglePubSubOperationBinding.java | 4 +++- .../v0/_2_0/server/GooglePubSubServerBinding.java | 4 +++- 19 files changed, 57 insertions(+), 13 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java index 75bbfaf9..57808d7c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java @@ -10,7 +10,9 @@ * The Channel Bindings Object is used to describe the Google Cloud Pub/Sub specific Topic details with AsyncAPI. * * @see Google Cloud Pub/Sub channel binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java index 804266d1..c3ae3246 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubMessageBinding.java @@ -12,7 +12,9 @@ * pertintent parts of the Google Cloud Pub/Sub Schema Object, with AsyncAPI. * * @see Google Cloud Pub/Sub message binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java index 3a1ae8ff..d7bd0a93 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubOperationBinding.java @@ -9,7 +9,9 @@ * Describes Google Cloud Pub/Sub operation binding. * * @see Google Cloud Pub/Sub operation binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java index 2548be44..bd771f4c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubServerBinding.java @@ -9,7 +9,9 @@ * Describes Google Cloud Pub/Sub server binding. * * @see Google Cloud Pub/Sub server binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java index 564459c3..0a1b553f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java @@ -14,9 +14,11 @@ *

* The Channel Bindings Object is used to describe the Google Cloud Pub/Sub specific Topic details with AsyncAPI. * - * @version 0.1.0 * @see Google Cloud Pub/Sub channel binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java index a76810a9..12dfcaba 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java @@ -13,9 +13,11 @@ *

* The Message Storage Policy Object is used to describe the Google Cloud Pub/Sub MessageStoragePolicy Object with AsyncAPI. * - * @version 0.1.0 * @see Google Cloud Pub/Sub channel binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java index 2d642c0d..46aa45d3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java @@ -11,6 +11,11 @@ * Describes Google Cloud Pub/Sub SchemaSettings. *

* The Schema Settings Object is used to describe the Google Cloud Pub/Sub SchemaSettings Object with AsyncAPI. + * + * @see Google Cloud Pub/Sub + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java index d5369f8b..7b5a6b4b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java @@ -12,9 +12,11 @@ * The Message Binding Object is used to describe the Google Cloud Pub/Sub specific PubsubMessage details, alongside with * pertintent parts of the Google Cloud Pub/Sub Schema Object, with AsyncAPI. * - * @version 0.1.0 * @see Google Cloud Pub/Sub message binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java index f0644327..2d1b8ed0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java @@ -14,9 +14,11 @@ * provide this information here at all times, especially for cases where AsyncAPI does not natively support describing * payloads using a supported Google Cloud Pub/Sub schema format like Protobuf. * - * @version 0.1.0 * @see Google Cloud Pub/Sub message binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinitionType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinitionType.java index 8528bc4c..0e053924 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinitionType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinitionType.java @@ -6,10 +6,12 @@ /** * Describes Google Cloud Pub/Sub message schema definition type. * - * @version 0.1.0 * @see Google Cloud Pub/Sub message binding * @see Types of schemas + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonClassDescription("Describes Google Cloud Pub/Sub message schema definition type.") public enum GooglePubSubMessageSchemaDefinitionType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java index b5c065f1..7d3f844c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/operation/GooglePubSubOperationBinding.java @@ -10,9 +10,11 @@ *

* Describes Google Cloud Pub/Sub operation binding. * - * @version 0.1.0 * @see Google Cloud Pub/Sub operation binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java index 8332c14a..a6817995 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/server/GooglePubSubServerBinding.java @@ -10,9 +10,11 @@ *

* Describes Google Cloud Pub/Sub server binding. * - * @version 0.1.0 * @see Google Cloud Pub/Sub server binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java index 5857fe72..f18f0649 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java @@ -14,9 +14,11 @@ *

* The Channel Bindings Object is used to describe the Google Cloud Pub/Sub specific Topic details with AsyncAPI. * - * @version 0.2.0 * @see Google Cloud Pub/Sub channel binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java index e5da58d9..13a4218f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java @@ -13,9 +13,11 @@ *

* The Message Storage Policy Object is used to describe the Google Cloud Pub/Sub MessageStoragePolicy Object with AsyncAPI. * - * @version 0.2.0 * @see Google Cloud Pub/Sub channel binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java index 65e18bf7..120b1548 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java @@ -11,6 +11,11 @@ * Describes Google Cloud Pub/Sub SchemaSettings. *

* The Schema Settings Object is used to describe the Google Cloud Pub/Sub SchemaSettings Object with AsyncAPI. + * + * @see Google Cloud Pub/Sub + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java index 929e726d..d1904cb2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java @@ -12,9 +12,11 @@ * The Message Binding Object is used to describe the Google Cloud Pub/Sub specific PubsubMessage details, alongside with * pertintent parts of the Google Cloud Pub/Sub Schema Object, with AsyncAPI. * - * @version 0.2.0 * @see Google Cloud Pub/Sub message binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java index 3e7b8dd0..3e36aa59 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java @@ -14,9 +14,11 @@ * provide this information here at all times, especially for cases where AsyncAPI does not natively support describing * payloads using a supported Google Cloud Pub/Sub schema format like Protobuf. * - * @version 0.2.0 * @see Google Cloud Pub/Sub message binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/operation/GooglePubSubOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/operation/GooglePubSubOperationBinding.java index 81262af4..6135702d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/operation/GooglePubSubOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/operation/GooglePubSubOperationBinding.java @@ -10,9 +10,11 @@ *

* Describes Google Cloud Pub/Sub operation binding. * - * @version 0.2.0 * @see Google Cloud Pub/Sub operation binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/server/GooglePubSubServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/server/GooglePubSubServerBinding.java index 9860fa1a..b85703f4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/server/GooglePubSubServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/server/GooglePubSubServerBinding.java @@ -10,9 +10,11 @@ *

* Describes Google Cloud Pub/Sub server binding. * - * @version 0.2.0 * @see Google Cloud Pub/Sub server binding + * @see Google Cloud Pub/Sub * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor From f7c0dfdfc479710c4071d7c79c45bd152159cd94 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:08:18 +0400 Subject: [PATCH 113/141] docs(bindings): HTTP docs --- .../asyncapi/bindings/http/HTTPChannelBinding.java | 2 ++ .../asyncapi/bindings/http/HTTPMessageBinding.java | 2 ++ .../asyncapi/bindings/http/HTTPOperationBinding.java | 2 ++ .../com/asyncapi/bindings/http/HTTPServerBinding.java | 2 ++ .../http/v0/_1_0/channel/HTTPChannelBinding.java | 4 +++- .../http/v0/_1_0/message/HTTPMessageBinding.java | 4 +++- .../http/v0/_1_0/operation/HTTPOperationBinding.java | 4 +++- .../http/v0/_1_0/operation/HTTPOperationMethod.java | 8 +++++--- .../http/v0/_1_0/operation/HTTPOperationType.java | 11 +++++++++++ .../http/v0/_1_0/server/HTTPServerBinding.java | 4 +++- .../http/v0/_2_0/channel/HTTPChannelBinding.java | 4 +++- .../http/v0/_2_0/message/HTTPMessageBinding.java | 4 +++- .../http/v0/_2_0/operation/HTTPOperationBinding.java | 4 +++- .../http/v0/_2_0/operation/HTTPOperationMethod.java | 8 +++++--- .../http/v0/_2_0/server/HTTPServerBinding.java | 4 +++- .../http/v0/_3_0/channel/HTTPChannelBinding.java | 4 +++- .../http/v0/_3_0/message/HTTPMessageBinding.java | 4 +++- .../http/v0/_3_0/operation/HTTPOperationBinding.java | 4 +++- .../http/v0/_3_0/operation/HTTPOperationMethod.java | 4 +++- .../http/v0/_3_0/server/HTTPServerBinding.java | 4 +++- 20 files changed, 68 insertions(+), 19 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPChannelBinding.java index 569c12fb..866e1db8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPChannelBinding.java @@ -9,7 +9,9 @@ * Describes HTTP channel binding. * * @see HTTP channel binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPMessageBinding.java index c6a871d8..95f588bc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPMessageBinding.java @@ -9,7 +9,9 @@ * Contains information about the message representation in HTTP. * * @see HTTP message binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPOperationBinding.java index 80731d57..f624c5b6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPOperationBinding.java @@ -9,7 +9,9 @@ * Contains information about the operation representation in HTTP. * * @see HTTP operation binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPServerBinding.java index f880c936..2f97bc67 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/HTTPServerBinding.java @@ -9,7 +9,9 @@ * Describes HTTP server binding. * * @see HTTP server binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java index 374ac399..72cf50dc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/channel/HTTPChannelBinding.java @@ -10,9 +10,11 @@ *

* Describes HTTP channel binding. * - * @version 0.1.0 * @see HTTP channel binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java index 2eda6553..a1cb612f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the message representation in HTTP. * - * @version 0.1.0 * @see HTTP message binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java index 6bab3c85..fcd63d58 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java @@ -12,9 +12,11 @@ *

* Contains information about the operation representation in HTTP. * - * @version 0.1.0 * @see HTTP operation binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationMethod.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationMethod.java index bb7b2f89..40082e68 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationMethod.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationMethod.java @@ -1,13 +1,15 @@ package com.asyncapi.bindings.http.v0._1_0.operation; /** - * Describes HTTP operation type. + * Describes HTTP operation method type. *

- * Contains information about the operation type. + * Contains information about the operation method. * - * @version 0.1.0 * @see HTTP operation binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ public enum HTTPOperationMethod { GET, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationType.java index 7c5a5fad..a3808c52 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationType.java @@ -2,6 +2,17 @@ import com.fasterxml.jackson.annotation.JsonProperty; +/** + * Describes HTTP operation type. + *

+ * Contains information about the operation type. + * + * @see HTTP operation binding + * @see MDN HTTP overview + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ public enum HTTPOperationType { @JsonProperty("request") diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java index cef30738..62e22ffa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/server/HTTPServerBinding.java @@ -10,9 +10,11 @@ *

* Describes HTTP server binding. * - * @version 0.1.0 * @see HTTP server binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/channel/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/channel/HTTPChannelBinding.java index e8edc01d..31294116 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/channel/HTTPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/channel/HTTPChannelBinding.java @@ -10,9 +10,11 @@ *

* Describes HTTP channel binding. * - * @version 0.2.0 * @see HTTP channel binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java index de565866..7ca1a1f1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the message representation in HTTP. * - * @version 0.2.0 * @see HTTP message binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java index 28cf99b7..c72e96d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the operation representation in HTTP. * - * @version 0.2.0 * @see HTTP operation binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationMethod.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationMethod.java index 067ea0d0..682d2846 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationMethod.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationMethod.java @@ -1,13 +1,15 @@ package com.asyncapi.bindings.http.v0._2_0.operation; /** - * Describes HTTP operation type. + * Describes HTTP operation method. *

- * Contains information about the operation type. + * Contains information about the operation method. * - * @version 0.1.0 * @see HTTP operation binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ public enum HTTPOperationMethod { GET, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/server/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/server/HTTPServerBinding.java index aa0fde30..05d26b0f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/server/HTTPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/server/HTTPServerBinding.java @@ -10,9 +10,11 @@ *

* Describes HTTP server binding. * - * @version 0.2.0 * @see HTTP server binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/channel/HTTPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/channel/HTTPChannelBinding.java index afb3cca2..3fc20cc7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/channel/HTTPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/channel/HTTPChannelBinding.java @@ -10,9 +10,11 @@ *

* Describes HTTP channel binding. * - * @version 0.3.0 * @see HTTP channel binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java index 4a23061f..7baaae10 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the message representation in HTTP. * - * @version 0.3.0 * @see HTTP message binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java index 6b96c95a..c55eb41b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java @@ -11,9 +11,11 @@ *

* Contains information about the operation representation in HTTP. * - * @version 0.3.0 * @see HTTP operation binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationMethod.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationMethod.java index 37fa1066..d0d167a5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationMethod.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationMethod.java @@ -5,9 +5,11 @@ *

* Contains information about the operation type. * - * @version 0.1.0 * @see HTTP operation binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ public enum HTTPOperationMethod { GET, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/server/HTTPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/server/HTTPServerBinding.java index 62896d53..a1fbe94b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/server/HTTPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/server/HTTPServerBinding.java @@ -10,9 +10,11 @@ *

* Describes HTTP server binding. * - * @version 0.3.0 * @see HTTP server binding + * @see MDN HTTP overview * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor From 95f826e14131f4fe7ad650a1ba5dc4528adbf2eb Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:11:21 +0400 Subject: [PATCH 114/141] docs(bindings): IBM MQ docs --- .../com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java | 5 ++--- .../com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java | 5 ++--- .../com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java | 6 +++--- .../com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java | 4 +++- .../bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java | 5 +++-- .../ibmmq/v0/_1_0/channel/IBMMQChannelDestinationType.java | 4 +++- .../ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java | 4 +++- .../ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java | 4 +++- .../bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java | 5 +++-- .../bindings/ibmmq/v0/_1_0/message/IBMMQMessageType.java | 4 +++- .../ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java | 5 +++-- .../bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java | 5 +++-- 12 files changed, 34 insertions(+), 22 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java index e4833d8f..620fa9ee 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQChannelBinding.java @@ -7,12 +7,11 @@ /** * Describes IBM MQ channel binding. - *

- * This object contains information about the channel representation in IBM MQ. Each channel corresponds to a Queue or Topic within IBM MQ. * - * @version 0.1.0 * @see IBM MQ channel binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java index a857b17a..12120a58 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQMessageBinding.java @@ -7,12 +7,11 @@ /** * Describes IBM MQ message binding. - *

- * This object contains information about the message representation in IBM MQ. * - * @version 0.1.0 * @see IBM MQ message binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java index 96cb287c..d2745adc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQOperationBinding.java @@ -7,12 +7,12 @@ /** * Describes IBM MQ operation binding. - *

- * This object MUST NOT contain any properties. Its name is reserved for future use. * - * @version 0.1.0 * @see IBM MQ operation binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java index 38ed19db..45cab57e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/IBMMQServerBinding.java @@ -9,11 +9,13 @@ * Describes IBM MQ server binding. *

* This object contains server connection information about the IBM MQ server, referred to as an IBM MQ queue manager. + *

* This object contains additional connectivity information not possible to represent within the core AsyncAPI specification. * - * @version 0.1.0 * @see IBM MQ server binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java index 0578168a..aa684b8c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.ibmmq.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -12,9 +11,11 @@ *

* This object contains information about the channel representation in IBM MQ. Each channel corresponds to a Queue or Topic within IBM MQ. * - * @version 0.1.0 * @see IBM MQ channel binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelDestinationType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelDestinationType.java index 5afd6eb6..157d0117 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelDestinationType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelDestinationType.java @@ -5,9 +5,11 @@ /** * Describes IBM MQ channel destination type. * - * @version 0.1.0 * @see IBM MQ channel binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ public enum IBMMQChannelDestinationType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java index c5525d55..4055b4a2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java @@ -10,9 +10,11 @@ /** * Describes IBM MQ channel queue properties. * - * @version 0.1.0 * @see IBM MQ channel binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java index 4374a731..a01c3a0b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java @@ -8,9 +8,11 @@ /** * Describes IBM MQ channel topic properties. * - * @version 0.1.0 * @see IBM MQ channel binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java index 89338f4a..d5c9a82b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.ibmmq.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -12,9 +11,11 @@ *

* This object contains information about the message representation in IBM MQ. * - * @version 0.1.0 * @see IBM MQ message binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageType.java index 5d09d9d3..808b5aa3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageType.java @@ -7,9 +7,11 @@ *

* This object contains information about the message type in IBM MQ. * - * @version 0.1.0 * @see IBM MQ message binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ public enum IBMMQMessageType { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java index 9a6d25f9..4d869547 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/operation/IBMMQOperationBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.ibmmq.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,9 +11,11 @@ *

* This object MUST NOT contain any properties. Its name is reserved for future use. * - * @version 0.1.0 * @see IBM MQ operation binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java index 5c20fc38..4013e37e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.ibmmq.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -13,9 +12,11 @@ * This object contains server connection information about the IBM MQ server, referred to as an IBM MQ queue manager. * This object contains additional connectivity information not possible to represent within the core AsyncAPI specification. * - * @version 0.1.0 * @see IBM MQ server binding + * @see IBM MQ * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder From ba7d3961f1b670b8408ea3d2b15baf7e4712279e Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:14:25 +0400 Subject: [PATCH 115/141] docs(bindings): JMS docs --- .../com/asyncapi/bindings/jms/JMSChannelBinding.java | 6 +++--- .../com/asyncapi/bindings/jms/JMSMessageBinding.java | 6 +++--- .../com/asyncapi/bindings/jms/JMSOperationBinding.java | 6 +++--- .../java/com/asyncapi/bindings/jms/JMSServerBinding.java | 5 ++--- .../bindings/jms/v0/_0_1/channel/JMSChannelBinding.java | 6 +++--- .../jms/v0/_0_1/channel/JMSChannelDestinationType.java | 9 +++++++++ .../bindings/jms/v0/_0_1/message/JMSMessageBinding.java | 7 +++---- .../jms/v0/_0_1/operation/JMSOperationBinding.java | 4 +++- .../bindings/jms/v0/_0_1/server/JMSServerBinding.java | 6 +++--- .../bindings/jms/v0/_0_1/server/JMSServerProperty.java | 9 +++++++++ 10 files changed, 41 insertions(+), 23 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java index 3191dee9..fbf91796 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSChannelBinding.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes JMS channel binding. * - * @version 0.1.0 * @see JMS channel binding + * @see Java Message Service * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java index 312e5092..614a6795 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSMessageBinding.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes JMS message binding. * - * @version 0.1.0 * @see JMS message binding + * @see Java Message Service * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java index 875dfe00..defd14de 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSOperationBinding.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes JMS operation binding. * - * @version 0.1.0 * @see JMS operation binding + * @see Java Message Service * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java index 5a9d5936..01c97710 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/JMSServerBinding.java @@ -6,13 +6,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes JMS server binding. * - * @version 0.1.0 * @see JMS server binding + * @see Java Message Service * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java index ded15e31..eeccc8e0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java @@ -5,13 +5,13 @@ import org.jetbrains.annotations.Nullable; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes JMS channel binding. * - * @version 0.1.0 * @see JMS channel binding + * @see Java Message Service * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelDestinationType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelDestinationType.java index 670ae721..f9ed4411 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelDestinationType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelDestinationType.java @@ -2,6 +2,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; +/** + * Describes JMS channel destination type. + * + * @see JMS channel binding + * @see Java Message Service + * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 + */ public enum JMSChannelDestinationType { @JsonProperty("queue") diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java index 2632c266..4a47b611 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java @@ -6,13 +6,12 @@ import org.jetbrains.annotations.Nullable; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes JMS message binding. * - * @version 0.1.0 - * @see JMS message binding + * @see Java Message Service * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java index 024065f3..d63f0d00 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/operation/JMSOperationBinding.java @@ -10,9 +10,11 @@ *

* Describes JMS operation binding. * - * @version 0.1.0 * @see JMS operation binding + * @see Java Message Service * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java index 9882dbb2..6e2c6724 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java @@ -8,13 +8,13 @@ import java.util.List; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes JMS server binding. * - * @version 0.1.0 * @see JMS server binding + * @see Java Message Service * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerProperty.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerProperty.java index fd0a6180..7a7d310a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerProperty.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerProperty.java @@ -5,6 +5,15 @@ import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; +/** + * Describes JMS server property. + * + * @see JMS server binding + * @see Java Message Service + * @author Pavel Bodiachevskii + * @version 0.0.1 + * @since 1.0.0-RC2 + */ @Data @NoArgsConstructor @AllArgsConstructor From f8f6ed3f5b200c7ac605cc86cfc475c0428b5054 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:17:30 +0400 Subject: [PATCH 116/141] docs(bindings): Mercure docs --- .../com/asyncapi/bindings/mercure/MercureChannelBinding.java | 5 ++--- .../com/asyncapi/bindings/mercure/MercureMessageBinding.java | 5 ++--- .../asyncapi/bindings/mercure/MercureOperationBinding.java | 5 ++--- .../com/asyncapi/bindings/mercure/MercureServerBinding.java | 5 ++--- .../mercure/v0/_1_0/channel/MercureChannelBinding.java | 4 +++- .../mercure/v0/_1_0/message/MercureMessageBinding.java | 4 +++- .../mercure/v0/_1_0/operation/MercureOperationBinding.java | 4 +++- .../mercure/v0/_1_0/server/MercureServerBinding.java | 4 +++- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java index d717e3d3..e4a5ea6b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureChannelBinding.java @@ -6,13 +6,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Mercure channel binding. * - * @version 0.1.0 * @see Mercure channel binding + * @see Mercure * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java index 62c0ae12..8cf46ab1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureMessageBinding.java @@ -6,13 +6,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Mercure message binding. * - * @version 0.1.0 * @see Mercure message binding + * @see Mercure * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java index afa8ba18..541bbd95 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureOperationBinding.java @@ -6,13 +6,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Mercure operation binding. * - * @version 0.1.0 * @see Mercure operation binding + * @see Mercure * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java index f676599d..7af11624 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/MercureServerBinding.java @@ -6,13 +6,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Mercure server binding. * - * @version 0.1.0 * @see Mercure server binding + * @see Mercure * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java index 7fcb400a..616b9edb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/channel/MercureChannelBinding.java @@ -10,9 +10,11 @@ *

* Describes Mercure channel binding. * - * @version 0.1.0 * @see Mercure channel binding + * @see Mercure * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java index f9b6dcc1..7881a70d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/message/MercureMessageBinding.java @@ -10,9 +10,11 @@ *

* Describes Mercure message binding. * - * @version 0.1.0 * @see Mercure message binding + * @see Mercure * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java index 540cab27..ade40461 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/operation/MercureOperationBinding.java @@ -10,9 +10,11 @@ *

* Describes Mercure operation binding. * - * @version 0.1.0 * @see Mercure operation binding + * @see Mercure * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java index 781e645a..273141ca 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mercure/v0/_1_0/server/MercureServerBinding.java @@ -10,9 +10,11 @@ *

* Describes Mercure server binding. * - * @version 0.1.0 * @see Mercure server binding + * @see Mercure * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor From fcaf86199f395e9fbd4892f3f4f3a3af3ab1918a Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:20:58 +0400 Subject: [PATCH 117/141] docs(bindings): NATS docs --- .../java/com/asyncapi/bindings/nats/NATSChannelBinding.java | 6 +++--- .../java/com/asyncapi/bindings/nats/NATSMessageBinding.java | 6 +++--- .../com/asyncapi/bindings/nats/NATSOperationBinding.java | 4 +++- .../java/com/asyncapi/bindings/nats/NATSServerBinding.java | 5 ++--- .../bindings/nats/v0/_1_0/channel/NATSChannelBinding.java | 5 +++-- .../bindings/nats/v0/_1_0/message/NATSMessageBinding.java | 5 +++-- .../nats/v0/_1_0/operation/NATSOperationBinding.java | 5 +++-- .../bindings/nats/v0/_1_0/server/NATSServerBinding.java | 5 +++-- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSChannelBinding.java index 14b4d97a..63b99770 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSChannelBinding.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes NATS channel binding. * - * @version 0.1.0 * @see NATS channel binding + * @see NATS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSMessageBinding.java index 5699aec1..6b8bddde 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSMessageBinding.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes NATS message binding. * - * @version 0.1.0 * @see NATS message binding + * @see NATS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSOperationBinding.java index 0553e736..86bb18f4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSOperationBinding.java @@ -8,9 +8,11 @@ /** * Describes NATS operation binding. * - * @version 0.1.0 * @see NATS operation binding + * @see NATS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSServerBinding.java index 362ba17c..aef81625 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/NATSServerBinding.java @@ -6,13 +6,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes NATS channel binding. * - * @version 0.1.0 * @see NATS server binding + * @see NATS * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java index 5256d244..81f06a31 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/channel/NATSChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.nats.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -11,9 +10,11 @@ *

* Describes NATS channel binding. * - * @version 0.1.0 * @see NATS channel binding + * @see NATS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java index 594c5238..fcce1b77 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/message/NATSMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.nats.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -11,9 +10,11 @@ *

* Describes NATS message binding. * - * @version 0.1.0 * @see NATS message binding + * @see NATS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java index b808f11e..afdfb2f3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.nats.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -10,9 +9,11 @@ /** * Describes NATS operation binding. * - * @version 0.1.0 * @see NATS operation binding + * @see NATS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java index 076ebef1..9a02f33f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/server/NATSServerBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.nats.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -11,9 +10,11 @@ *

* Describes NATS channel binding. * - * @version 0.1.0 * @see NATS server binding + * @see NATS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor From 3596d1935c8d5de0f69da65b356281f9f38dcb8f Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:25:21 +0400 Subject: [PATCH 118/141] docs(bindings): Pulsar and Redis docs --- .../com/asyncapi/bindings/pulsar/PulsarChannelBinding.java | 4 +++- .../com/asyncapi/bindings/pulsar/PulsarMessageBinding.java | 6 +++--- .../asyncapi/bindings/pulsar/PulsarOperationBinding.java | 6 +++--- .../com/asyncapi/bindings/pulsar/PulsarServerBinding.java | 3 ++- .../pulsar/v0/_1_0/channel/PulsarChannelBinding.java | 4 +++- .../pulsar/v0/_1_0/channel/PulsarChannelPersistence.java | 4 +++- .../v0/_1_0/channel/PulsarChannelRetentionDefinition.java | 4 +++- .../pulsar/v0/_1_0/message/PulsarMessageBinding.java | 4 +++- .../pulsar/v0/_1_0/operation/PulsarOperationBinding.java | 4 +++- .../bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java | 4 +++- .../com/asyncapi/bindings/redis/RedisChannelBinding.java | 6 +++--- .../com/asyncapi/bindings/redis/RedisMessageBinding.java | 6 +++--- .../com/asyncapi/bindings/redis/RedisOperationBinding.java | 6 +++--- .../com/asyncapi/bindings/redis/RedisServerBinding.java | 5 ++--- .../bindings/redis/v0/_1_0/channel/RedisChannelBinding.java | 4 +++- .../bindings/redis/v0/_1_0/message/RedisMessageBinding.java | 4 +++- .../redis/v0/_1_0/operation/RedisOperationBinding.java | 4 +++- .../bindings/redis/v0/_1_0/server/RedisServerBinding.java | 4 +++- 18 files changed, 52 insertions(+), 30 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java index d67a7134..17c85dd1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarChannelBinding.java @@ -8,9 +8,11 @@ /** * Describes Pulsar channel binding. * - * @version 0.1.0 * @see Pulsar channel binding + * @see Pulsar * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java index 510466e9..70beb28b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarMessageBinding.java @@ -7,12 +7,12 @@ /** * Describes Pulsar message binding. - *

- * This object MUST NOT contain any properties. Its name is reserved for future use. * - * @version 0.1.0 * @see Pulsar message binding + * @see Pulsar * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java index 4fd2f4ef..23fb08c0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarOperationBinding.java @@ -7,12 +7,12 @@ /** * Describes Pulsar operation binding. - *

- * This object MUST NOT contain any properties. Its name is reserved for future use. * - * @version 0.1.0 * @see Pulsar operation binding + * @see Pulsar * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java index f1110610..3a000735 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/PulsarServerBinding.java @@ -8,9 +8,10 @@ /** * Describes Pulsar server binding. * - * @version 0.1.0 * @see Redis server binding + * @see Pulsar * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java index 91f19357..d53520c2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java @@ -12,9 +12,11 @@ /** * Describes Pulsar channel binding. * - * @version 0.1.0 * @see Pulsar channel binding + * @see Pulsar * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelPersistence.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelPersistence.java index c3e9e250..ed7ccaef 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelPersistence.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelPersistence.java @@ -6,9 +6,11 @@ /** * Describes Pulsar channel persistence. * - * @version 0.1.0 * @see Pulsar channel binding + * @see Pulsar * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonClassDescription("Describes Pulsar channel persistence.") public enum PulsarChannelPersistence { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java index 1f592c21..cc99bc71 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java @@ -11,9 +11,11 @@ *

* The Retention Definition Object is used to describe the Pulsar Retention policy. * - * @version 0.1.0 * @see Pulsar channel binding + * @see Pulsar * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java index fb8eeab9..ec3970f5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/message/PulsarMessageBinding.java @@ -11,9 +11,11 @@ *

* This object MUST NOT contain any properties. Its name is reserved for future use. * - * @version 0.1.0 * @see Pulsar message binding + * @see Pulsar * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java index d4fea223..474b3266 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/operation/PulsarOperationBinding.java @@ -11,9 +11,11 @@ *

* This object MUST NOT contain any properties. Its name is reserved for future use. * - * @version 0.1.0 * @see Pulsar operation binding + * @see Pulsar * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java index 9fcc0346..3e82e1a6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java @@ -9,9 +9,11 @@ /** * Describes Pulsar server binding. * - * @version 0.1.0 * @see Redis server binding + * @see Pulsar * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisChannelBinding.java index b4e868d5..fda5fa6d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisChannelBinding.java @@ -7,13 +7,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Redis channel binding. * - * @version 0.1.0 * @see Redis channel binding + * @see Redis * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisMessageBinding.java index f889cbc3..7f74c770 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisMessageBinding.java @@ -7,13 +7,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Redis message binding. * - * @version 0.1.0 * @see Redis message binding + * @see Redis * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisOperationBinding.java index 616cd1cc..17a931e9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisOperationBinding.java @@ -7,13 +7,13 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Redis operation binding. * - * @version 0.1.0 * @see Redis operation binding + * @see Redis * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisServerBinding.java index c7b9cfa3..30a12f83 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/RedisServerBinding.java @@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes Redis server binding. * - * @version 0.1.0 * @see Redis server binding + * @see Redis * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java index 9c283a4e..3d7c7328 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/channel/RedisChannelBinding.java @@ -10,9 +10,11 @@ *

* Describes Redis channel binding. * - * @version 0.1.0 * @see Redis channel binding + * @see Redis * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java index b364611e..96a89988 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/message/RedisMessageBinding.java @@ -10,9 +10,11 @@ *

* Describes Redis message binding. * - * @version 0.1.0 * @see Redis message binding + * @see Redis * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java index f311da04..e3473df4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/operation/RedisOperationBinding.java @@ -10,9 +10,11 @@ *

* Describes Redis operation binding. * - * @version 0.1.0 * @see Redis operation binding + * @see Redis * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java index 4b3f4aee..f9ef480d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/redis/v0/_1_0/server/RedisServerBinding.java @@ -10,9 +10,11 @@ *

* Describes Redis server binding. * - * @version 0.1.0 * @see Redis server binding + * @see Redis * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor From 3ed73ea86a84f3c417a2ace38b5bfd2ac6558068 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:29:24 +0400 Subject: [PATCH 119/141] docs(bindings): Amazon SNS docs --- .../com/asyncapi/bindings/sns/SNSChannelBinding.java | 5 ++--- .../com/asyncapi/bindings/sns/SNSMessageBinding.java | 5 ++--- .../com/asyncapi/bindings/sns/SNSOperationBinding.java | 5 ++--- .../java/com/asyncapi/bindings/sns/SNSServerBinding.java | 5 ++--- .../bindings/sns/v0/_1_0/channel/SNSChannelBinding.java | 2 +- .../bindings/sns/v0/_1_0/channel/SNSChannelOrdering.java | 2 +- .../sns/v0/_1_0/channel/SNSChannelOrderingType.java | 2 +- .../bindings/sns/v0/_1_0/channel/SNSChannelPolicy.java | 2 +- .../sns/v0/_1_0/channel/SNSChannelPolicyStatement.java | 2 +- .../v0/_1_0/channel/SNSChannelPolicyStatementEffect.java | 9 +++++++++ .../bindings/sns/v0/_1_0/message/SNSMessageBinding.java | 2 +- .../sns/v0/_1_0/operation/SNSOperationBinding.java | 2 +- .../sns/v0/_1_0/operation/SNSOperationConsumer.java | 2 +- .../operation/SNSOperationConsumerDeliveryPolicy.java | 2 +- ...NSOperationConsumerDeliveryPolicyBackoffFunction.java | 9 +++++++++ .../operation/SNSOperationConsumerFilterPolicyScope.java | 9 +++++++++ .../v0/_1_0/operation/SNSOperationConsumerProtocol.java | 9 +++++++++ .../operation/SNSOperationConsumerRedrivePolicy.java | 2 +- .../operation/SNSOperationDestinationIdentifier.java | 2 +- .../bindings/sns/v0/_1_0/server/SNSServerBinding.java | 2 +- 20 files changed, 56 insertions(+), 24 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSChannelBinding.java index b87d8f69..034cfd33 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSChannelBinding.java @@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes SNS channel binding. * - * @version 0.1.0 * @see SNS channel binding + * @see Amazon SNS * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSMessageBinding.java index fa8917b3..46e20bd3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSMessageBinding.java @@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes SNS message binding. * - * @version 0.1.0 * @see SNS message binding + * @see Amazon SNS * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSOperationBinding.java index 7b3ab5cb..d71cb850 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSOperationBinding.java @@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes SNS operation binding. * - * @version 0.1.0 * @see SNS operation binding + * @see Amazon SNS * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSServerBinding.java index a806ce4e..bba5de47 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/SNSServerBinding.java @@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. Its name is reserved for future use. - *

* Describes SNS server binding. * - * @version 0.1.0 * @see SNS server binding + * @see Amazon SNS * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java index a0faa837..1932fcf5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java @@ -10,7 +10,7 @@ * Describes SNS channel binding. * * @see SNS channel binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrdering.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrdering.java index e6d7db0e..5e3ca991 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrdering.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrdering.java @@ -11,7 +11,7 @@ * By default, we assume an unordered SNS topic. This field allows configuration of a FIFO SNS Topic. * * @see SNS channel binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrderingType.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrderingType.java index c047e21c..5894f190 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrderingType.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelOrderingType.java @@ -6,7 +6,7 @@ * Defines the type of SNS Topic. * * @see SNS channel binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicy.java index 8a66994d..2fd1d102 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicy.java @@ -13,7 +13,7 @@ * The security policy for the SNS Topic. * * @see SNS channel binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java index 459db08a..6b6eec49 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java @@ -12,7 +12,7 @@ * The security policy for the SNS Topic. * * @see SNS channel binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatementEffect.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatementEffect.java index 469a88da..8eea245b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatementEffect.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatementEffect.java @@ -2,6 +2,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; +/** + * The security policy effect for the SNS Topic. + * + * @see SNS channel binding + * @see Amazon SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ public enum SNSChannelPolicyStatementEffect { @JsonProperty("Allow") diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java index 322966e3..6e49fe31 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/message/SNSMessageBinding.java @@ -11,7 +11,7 @@ * Describes SNS message binding. * * @see SNS message binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java index 373809f4..24ec0d9b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java @@ -11,7 +11,7 @@ * Describes SNS operation binding. * * @see SNS operation binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumer.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumer.java index 0a81c1f3..a2a7e5be 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumer.java @@ -11,7 +11,7 @@ * Describes SNS operation topic consumer. * * @see SNS operation binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicy.java index d1466afb..4853fe22 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicy.java @@ -10,7 +10,7 @@ * Describes SNS operation delivery policy. * * @see SNS operation binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicyBackoffFunction.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicyBackoffFunction.java index 1a208fd6..b82fc61a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicyBackoffFunction.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerDeliveryPolicyBackoffFunction.java @@ -2,6 +2,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; +/** + * Describes SNS operation delivery policy backoff function. + * + * @see SNS operation binding + * @see Amazon SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ public enum SNSOperationConsumerDeliveryPolicyBackoffFunction { @JsonProperty("arithmetic") diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerFilterPolicyScope.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerFilterPolicyScope.java index 8c4200a2..011c7d4a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerFilterPolicyScope.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerFilterPolicyScope.java @@ -2,6 +2,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; +/** + * Describes SNS consumer filter policy scope. + * + * @see SNS operation binding + * @see Amazon SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ public enum SNSOperationConsumerFilterPolicyScope { @JsonProperty("MessageAttributes") diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerProtocol.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerProtocol.java index 33ea109b..98dbb8de 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerProtocol.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerProtocol.java @@ -2,6 +2,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; +/** + * Describes SNS consumer protocol. + * + * @see SNS operation binding + * @see Amazon SNS + * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 + */ public enum SNSOperationConsumerProtocol { @JsonProperty("http") diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerRedrivePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerRedrivePolicy.java index d5e14c6f..5bcaaec7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerRedrivePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationConsumerRedrivePolicy.java @@ -13,7 +13,7 @@ * Prevent poison pill messages by moving un-processable messages to an SQS dead letter queue. * * @see SNS operation binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationDestinationIdentifier.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationDestinationIdentifier.java index 6ac249f1..28ce0f44 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationDestinationIdentifier.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationDestinationIdentifier.java @@ -10,7 +10,7 @@ * Describes SNS operation destination identifier. * * @see SNS operation binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java index d661e143..35273fc5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/server/SNSServerBinding.java @@ -11,7 +11,7 @@ * Describes SNS server binding. * * @see SNS server binding - * @see SNS + * @see Amazon SNS * @author Pavel Bodiachevskii * @version 0.1.0 * @since 1.0.0-RC2 From 6a97c7e732c26a7c9cbfb9b7a71640e304f30284 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 14 May 2024 22:34:13 +0400 Subject: [PATCH 120/141] docs(bindings): Solace docs --- .../com/asyncapi/bindings/solace/SolaceChannelBinding.java | 1 - .../com/asyncapi/bindings/solace/SolaceMessageBinding.java | 1 - .../asyncapi/bindings/solace/SolaceOperationBinding.java | 1 - .../com/asyncapi/bindings/solace/SolaceServerBinding.java | 5 +++-- .../solace/v0/_3_0/channel/SolaceChannelBinding.java | 6 ++++-- .../solace/v0/_3_0/message/SolaceMessageBinding.java | 4 +++- .../solace/v0/_3_0/operation/SolaceOperationBinding.java | 4 +++- .../v0/_3_0/operation/SolaceOperationDestination.java | 4 +++- .../v0/_3_0/operation/queue/SolaceOperationQueue.java | 4 +++- .../bindings/solace/v0/_3_0/server/SolaceServerBinding.java | 4 +++- .../v0/_4_0/operation/SolaceOperationDestination.java | 4 +++- .../v0/_4_0/operation/queue/SolaceOperationQueue.java | 6 ++++-- 12 files changed, 29 insertions(+), 15 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java index b1a1a211..d56d8e61 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceChannelBinding.java @@ -12,7 +12,6 @@ * @see Solace channel binding * @see Solace * @author Pavel Bodiachevskii - * @version 0.2.0 * @since 1.0.0-RC2 */ @JsonTypeInfo( diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java index b53f81a9..b7c472fb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceMessageBinding.java @@ -12,7 +12,6 @@ * @see Solace message binding * @see Solace * @author Pavel Bodiachevskii - * @version 0.2.0 * @since 1.0.0-RC2 */ @JsonTypeInfo( diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java index f8961d78..589b1b69 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceOperationBinding.java @@ -12,7 +12,6 @@ * @see Solace operation binding * @see Solace * @author Pavel Bodiachevskii - * @version 0.2.0 * @since 1.0.0-RC2 */ @JsonTypeInfo( diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java index 32901da3..fa1807b9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/SolaceServerBinding.java @@ -9,9 +9,10 @@ /** * Describes Solace server binding. * - * @version 0.3.0 * @see Solace server binding - * @author Dennis Brinley, Pavel Bodiachevskii + * @see Solace + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java index 021f75ed..72e2d115 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java @@ -11,9 +11,11 @@ *

* Describes Solace channel binding. * - * @version 0.3.0 * @see Solace channel binding - * @author Pavel Bodiachevskii + * @see Solace + * @author Dennis Brinley, Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java index 6cbbcd93..bd0e1239 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java @@ -11,9 +11,11 @@ *

* Describes Solace message binding. * - * @version 0.3.0 * @see Solace message binding + * @see Solace * @author Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java index 17483c2e..961731f5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java @@ -13,9 +13,11 @@ *

* Contains information about the operation representation in Solace PubSub+ Broker. * - * @version 0.3.0 * @see Solace operation binding + * @see Solace * @author Dennis Brinley, Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java index a71e7a04..44036b38 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationDestination.java @@ -17,9 +17,11 @@ *

* Contains information about the destination in Solace PubSub+ Broker. * - * @version 0.3.0 * @see Solace operation binding + * @see Solace * @author Dennis Brinley, Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java index 6cfb4b95..f41d283d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/queue/SolaceOperationQueue.java @@ -16,9 +16,11 @@ *

* Contains information about the queue in Solace PubSub+ Broker. * - * @version 0.3.0 * @see Solace operation binding + * @see Solace * @author Dennis Brinley, Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java index edd289da..b08af49e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java @@ -9,9 +9,11 @@ /** * Describes Solace server binding. * - * @version 0.3.0 * @see Solace server binding + * @see Solace * @author Dennis Brinley, Pavel Bodiachevskii + * @version 0.3.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationDestination.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationDestination.java index ef73a2b0..96c090a5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationDestination.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationDestination.java @@ -17,9 +17,11 @@ *

* Contains information about the destination in Solace PubSub+ Broker. * - * @version 0.4.0 * @see Solace operation binding + * @see Solace * @author Pavel Bodiachevskii + * @version 0.4.0 + * @since 1.0.0-RC2 */ @Data @Builder diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/queue/SolaceOperationQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/queue/SolaceOperationQueue.java index c0f622e0..dfa5c68f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/queue/SolaceOperationQueue.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/queue/SolaceOperationQueue.java @@ -16,9 +16,11 @@ *

* Contains information about the queue in Solace PubSub+ Broker. * - * @version 0.4.0 * @see Solace operation binding - * @author Dennis Brinley, Pavel Bodiachevskii + * @see Solace + * @author Pavel Bodiachevskii + * @version 0.4.0 + * @since 1.0.0-RC2 */ @Data @Builder From 02427b4cd83adcedf59a7e9e7776404c2a6c748e Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 01:29:11 +0400 Subject: [PATCH 121/141] docs(bindings): Amazon SQS docs --- .../com/asyncapi/bindings/sqs/SQSChannelBinding.java | 2 +- .../com/asyncapi/bindings/sqs/SQSMessageBinding.java | 2 +- .../com/asyncapi/bindings/sqs/SQSOperationBinding.java | 2 +- .../java/com/asyncapi/bindings/sqs/SQSServerBinding.java | 2 +- .../bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java | 4 +++- .../bindings/sqs/v0/_1_0/message/SQSMessageBinding.java | 4 +++- .../sqs/v0/_1_0/operation/SQSOperationBinding.java | 4 +++- .../bindings/sqs/v0/_1_0/server/SQSServerBinding.java | 4 +++- .../bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java | 2 +- .../channel/SQSChannelDeadLetterQueueIdentifier.java | 2 +- .../bindings/sqs/v0/_2_0/channel/SQSChannelQueue.java | 2 +- .../_2_0/channel/SQSChannelQueueDeduplicationScope.java | 2 +- .../_2_0/channel/SQSChannelQueueFifoThroughputLimit.java | 2 +- .../sqs/v0/_2_0/channel/SQSChannelQueuePolicy.java | 2 +- .../v0/_2_0/channel/SQSChannelQueuePolicyStatement.java | 2 +- .../channel/SQSChannelQueuePolicyStatementEffect.java | 9 +++++++++ .../sqs/v0/_2_0/channel/SQSChannelRedrivePolicy.java | 2 +- .../bindings/sqs/v0/_2_0/message/SQSMessageBinding.java | 2 +- .../sqs/v0/_2_0/operation/SQSOperationBinding.java | 2 +- .../operation/SQSOperationDeadLetterQueueIdentifier.java | 2 +- .../sqs/v0/_2_0/operation/SQSOperationQueue.java | 2 +- .../operation/SQSOperationQueueDeduplicationScope.java | 2 +- .../operation/SQSOperationQueueFifoThroughputLimit.java | 2 +- .../sqs/v0/_2_0/operation/SQSOperationQueuePolicy.java | 2 +- .../_2_0/operation/SQSOperationQueuePolicyStatement.java | 2 +- .../SQSOperationQueuePolicyStatementEffect.java | 9 +++++++++ .../sqs/v0/_2_0/operation/SQSOperationRedrivePolicy.java | 2 +- .../bindings/sqs/v0/_2_0/server/SQSServerBinding.java | 2 +- 28 files changed, 52 insertions(+), 26 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java index 5b82eff4..f10410c4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSChannelBinding.java @@ -9,7 +9,7 @@ * Describes SQS channel binding. * * @see SQS channel binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @since 1.0.0-RC2 */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java index 33d5043d..6c85baa1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSMessageBinding.java @@ -9,7 +9,7 @@ * Describes SQS message binding. * * @see SQS message binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @since 1.0.0-RC2 */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java index 9ae3ca88..88e15d39 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSOperationBinding.java @@ -9,7 +9,7 @@ * Describes SQS operation binding. * * @see SQS operation binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @since 1.0.0-RC2 */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java index 7c1a98c1..f103b1b8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/SQSServerBinding.java @@ -9,7 +9,7 @@ * Describes SQS server binding. * * @see SQS server binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @since 1.0.0-RC2 */ diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java index 2bd39fe8..ce31ca24 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java @@ -13,9 +13,11 @@ *

* Describes SQS channel binding. * - * @version 0.1.0 * @see SQS channel binding + * @see Amazon SQS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java index 3e23fc1d..99f1af0a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java @@ -13,9 +13,11 @@ *

* Describes SQS message binding. * - * @version 0.1.0 * @see SQS message binding + * @see Amazon SQS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java index e39c810b..8db9ac6c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java @@ -13,9 +13,11 @@ *

* Describes SQS operation binding. * - * @version 0.1.0 * @see SQS operation binding + * @see Amazon SQS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java index 5f2e2244..42078bd0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java @@ -13,9 +13,11 @@ *

* Describes SQS server binding. * - * @version 0.1.0 * @see SQS server binding + * @see Amazon SQS * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @NoArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java index 6a512a19..82fe9c2a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java @@ -8,7 +8,7 @@ * Describes SQS channel binding. * * @see SQS channel binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelDeadLetterQueueIdentifier.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelDeadLetterQueueIdentifier.java index 46187632..d5826151 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelDeadLetterQueueIdentifier.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelDeadLetterQueueIdentifier.java @@ -12,7 +12,7 @@ * The SQS queue to use as a dead letter queue (DLQ). * * @see SQS channel binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueue.java index a27b760f..aa6c4690 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueue.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueue.java @@ -13,7 +13,7 @@ * A definition of a SQS channel queue. * * @see SQS channel binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueDeduplicationScope.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueDeduplicationScope.java index dd475a5f..75fa8de7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueDeduplicationScope.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueDeduplicationScope.java @@ -6,7 +6,7 @@ * Specifies whether message deduplication occurs at the message group or queue level. * * @see SQS channel binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueFifoThroughputLimit.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueFifoThroughputLimit.java index 4b1e85c4..6aea840c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueFifoThroughputLimit.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueueFifoThroughputLimit.java @@ -6,7 +6,7 @@ * Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. * * @see SQS channel binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicy.java index 19bca4b5..a2baeac8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicy.java @@ -12,7 +12,7 @@ * A definition of a SQS channel queue policy. * * @see SQS channel binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatement.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatement.java index 1fde7828..e87e20b5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatement.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatement.java @@ -10,7 +10,7 @@ * A definition of a SQS channel queue policy statement. * * @see SQS channel binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatementEffect.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatementEffect.java index 311bada5..26f92425 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatementEffect.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelQueuePolicyStatementEffect.java @@ -2,6 +2,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; +/** + * A definition of a SQS channel queue policy statement effect. + * + * @see SQS channel binding + * @see Amazon SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ public enum SQSChannelQueuePolicyStatementEffect { @JsonProperty("Allow") diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelRedrivePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelRedrivePolicy.java index 9ddcb370..7f0d642e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelRedrivePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelRedrivePolicy.java @@ -11,7 +11,7 @@ * Prevent poison pill messages by moving un-processable messages to an SQS dead letter queue. * * @see SQS channel binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/message/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/message/SQSMessageBinding.java index 79484705..70d763cd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/message/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/message/SQSMessageBinding.java @@ -13,7 +13,7 @@ * Describes SQS message binding. * * @see SQS message binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java index 91304fa1..effcafe3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java @@ -11,7 +11,7 @@ * Describes SQS operation binding. * * @see SQS operation binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationDeadLetterQueueIdentifier.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationDeadLetterQueueIdentifier.java index b72dcc64..4e7be4c7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationDeadLetterQueueIdentifier.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationDeadLetterQueueIdentifier.java @@ -12,7 +12,7 @@ * The SQS queue to use as a dead letter queue (DLQ). * * @see SQS operation binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueue.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueue.java index dd11ad6a..e93e1777 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueue.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueue.java @@ -14,7 +14,7 @@ * A definition of a SQS operation queue. * * @see SQS operation binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueDeduplicationScope.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueDeduplicationScope.java index 597ff408..e975d80c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueDeduplicationScope.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueDeduplicationScope.java @@ -6,7 +6,7 @@ * Specifies whether message deduplication occurs at the message group or queue level. * * @see SQS operation binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueFifoThroughputLimit.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueFifoThroughputLimit.java index 2d78c4c9..7658d706 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueFifoThroughputLimit.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueueFifoThroughputLimit.java @@ -6,7 +6,7 @@ * Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. * * @see SQS operation binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicy.java index 8275b8ce..0debcc85 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicy.java @@ -12,7 +12,7 @@ * A definition of a SQS channel queue policy. * * @see SQS operation binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatement.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatement.java index 777f45dc..9147ce50 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatement.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatement.java @@ -10,7 +10,7 @@ * A definition of a SQS channel queue policy statement. * * @see SQS operation binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatementEffect.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatementEffect.java index 03190b13..cdc2190a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatementEffect.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationQueuePolicyStatementEffect.java @@ -2,6 +2,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; +/** + * A definition of a SQS channel queue policy statement effect. + * + * @see SQS operation binding + * @see Amazon SQS + * @author Pavel Bodiachevskii + * @version 0.2.0 + * @since 1.0.0-RC2 + */ public enum SQSOperationQueuePolicyStatementEffect { @JsonProperty("Allow") diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationRedrivePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationRedrivePolicy.java index 86d46da8..b16455de 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationRedrivePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationRedrivePolicy.java @@ -11,7 +11,7 @@ * Prevent poison pill messages by moving un-processable messages to an SQS dead letter queue. * * @see SQS operation binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/server/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/server/SQSServerBinding.java index 684d09ae..2c5adf8c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/server/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/server/SQSServerBinding.java @@ -13,7 +13,7 @@ * Describes SQS server binding. * * @see SQS server binding - * @see SQS + * @see Amazon SQS * @author Pavel Bodiachevskii * @version 0.2.0 * @since 1.0.0-RC2 From dcce9aa20754d92ef4e18f31f2f9b9262f86af20 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 01:31:36 +0400 Subject: [PATCH 122/141] docs(bindings): STOMP docs --- .../com/asyncapi/bindings/stomp/STOMPChannelBinding.java | 7 ++----- .../com/asyncapi/bindings/stomp/STOMPMessageBinding.java | 8 +++----- .../asyncapi/bindings/stomp/STOMPOperationBinding.java | 8 +++----- .../com/asyncapi/bindings/stomp/STOMPServerBinding.java | 8 +++----- .../stomp/v0/_1_0/channel/STOMPChannelBinding.java | 4 +++- .../stomp/v0/_1_0/message/STOMPMessageBinding.java | 4 +++- .../stomp/v0/_1_0/operation/STOMPOperationBinding.java | 4 +++- .../bindings/stomp/v0/_1_0/server/STOMPServerBinding.java | 4 +++- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java index 6d3aae50..2cc0f43c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java @@ -8,15 +8,12 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes STOMP channel binding. * - * @version 0.1.0 * @see STOMP channel binding + * @see STOMP * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java index 951fdfdd..a235a75b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java @@ -8,15 +8,13 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes STOMP message binding. * - * @version 0.1.0 * @see STOMP message binding + * @see STOMP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java index e9fd5b03..66913d53 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java @@ -8,15 +8,13 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes STOMP operation binding. * - * @version 0.1.0 * @see STOMP operation binding + * @see STOMP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java index b6097373..3257ef9a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java @@ -8,15 +8,13 @@ import lombok.NoArgsConstructor; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes STOMP server binding. * - * @version 0.1.0 * @see STOMP server binding + * @see STOMP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java index 28493c1d..30b1178c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java @@ -13,9 +13,11 @@ *

* Describes STOMP channel binding. * - * @version 0.1.0 * @see STOMP channel binding + * @see STOMP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java index 5aad2ea7..1fb47881 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java @@ -13,9 +13,11 @@ *

* Describes STOMP message binding. * - * @version 0.1.0 * @see STOMP message binding + * @see STOMP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java index 713ee10c..9109cc67 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java @@ -13,9 +13,11 @@ *

* Describes STOMP operation binding. * - * @version 0.1.0 * @see STOMP operation binding + * @see STOMP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java index af66ba51..44daf0c8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java @@ -13,9 +13,11 @@ *

* Describes STOMP server binding. * - * @version 0.1.0 * @see STOMP server binding + * @see STOMP * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) From b7276dcec4a1806523bd98daeae3e0b0eac68885 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 01:34:19 +0400 Subject: [PATCH 123/141] docs(bindings): WebSockets docs --- .../bindings/websockets/WebSocketsChannelBinding.java | 3 ++- .../bindings/websockets/WebSocketsMessageBinding.java | 7 ++----- .../bindings/websockets/WebSocketsOperationBinding.java | 7 ++----- .../bindings/websockets/WebSocketsServerBinding.java | 7 ++----- .../v0/_1_0/channel/WebSocketsChannelBinding.java | 4 +++- .../v0/_1_0/channel/WebSocketsChannelMethod.java | 4 +++- .../v0/_1_0/message/WebSocketsMessageBinding.java | 4 +++- .../v0/_1_0/operation/WebSocketsOperationBinding.java | 4 +++- .../websockets/v0/_1_0/server/WebSocketsServerBinding.java | 4 +++- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsChannelBinding.java index 0f8fa26d..36208b22 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsChannelBinding.java @@ -15,9 +15,10 @@ * WebSockets doesn't support virtual channels or, put it another way, there's only one channel and its characteristics * are strongly related to the protocol used for the handshake, i.e., HTTP. * - * @version 0.1.0 * @see WebSockets channel binding + * @see MDN WebSockets * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsMessageBinding.java index b93197bd..9348a6fa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsMessageBinding.java @@ -7,15 +7,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes WebSockets message binding. * - * @version 0.1.0 * @see WebSockets message binding + * @see MDN WebSockets * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsOperationBinding.java index a28cb4a9..e21f5d7e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsOperationBinding.java @@ -7,15 +7,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes WebSockets operation binding. * - * @version 0.1.0 * @see WebSockets operation binding + * @see MDN WebSockets * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsServerBinding.java index df8b25d4..0e4a8fb4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/WebSocketsServerBinding.java @@ -7,15 +7,12 @@ import lombok.EqualsAndHashCode; /** - * This class MUST NOT contain any properties. - *

- * Its name is reserved for future use. - *

* Describes WebSockets server binding. * - * @version 0.1.0 * @see WebSockets server binding + * @see MDN WebSockets * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java index 2f585354..1edac42d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelBinding.java @@ -21,9 +21,11 @@ * WebSockets doesn't support virtual channels or, put it another way, there's only one channel and its characteristics * are strongly related to the protocol used for the handshake, i.e., HTTP. * - * @version 0.1.0 * @see WebSockets channel binding + * @see MDN WebSockets * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @AllArgsConstructor diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelMethod.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelMethod.java index af2349d5..bb3e4bea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelMethod.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/channel/WebSocketsChannelMethod.java @@ -7,8 +7,10 @@ *

* Its value MUST be either GET or POST. * - * @version 0.1.0 + * @see MDN WebSockets * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ public enum WebSocketsChannelMethod { diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java index 8490162c..cba5af7c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/message/WebSocketsMessageBinding.java @@ -11,9 +11,11 @@ *

* Describes WebSockets message binding. * - * @version 0.1.0 * @see WebSockets message binding + * @see MDN WebSockets * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java index 18b5e20e..0a81aff5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/operation/WebSocketsOperationBinding.java @@ -11,9 +11,11 @@ *

* Describes WebSockets operation binding. * - * @version 0.1.0 * @see WebSockets operation binding + * @see MDN WebSockets * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java index fadd582b..fc71ccd1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/websockets/v0/_1_0/server/WebSocketsServerBinding.java @@ -11,9 +11,11 @@ *

* Describes WebSockets server binding. * - * @version 0.1.0 * @see WebSockets server binding + * @see MDN WebSockets * @author Pavel Bodiachevskii + * @version 0.1.0 + * @since 1.0.0-RC2 */ @Data @EqualsAndHashCode(callSuper = true) From 4aba8847ef0924a426e65e600c8cb2ebbcd313aa Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 01:38:00 +0400 Subject: [PATCH 124/141] docs(schemas): package-info for schemas and security schemas --- .../asyncapi/schemas/asyncapi/security/package-info.java | 8 ++++++++ .../src/main/java/com/asyncapi/schemas/package-info.java | 7 +++++++ 2 files changed, 15 insertions(+) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/package-info.java create mode 100644 asyncapi-core/src/main/java/com/asyncapi/schemas/package-info.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/package-info.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/package-info.java new file mode 100644 index 00000000..3f4ffce1 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/package-info.java @@ -0,0 +1,8 @@ +/** + * This module provide security schemas, used in AsyncAPI. + * + * @see Security Scheme + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +package com.asyncapi.schemas.asyncapi.security; \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/package-info.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/package-info.java new file mode 100644 index 00000000..56f3945d --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/package-info.java @@ -0,0 +1,7 @@ +/** + * This module provide schemas, used in AsyncAPI. + * + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +package com.asyncapi.schemas; \ No newline at end of file From 3aaab84ea96e9217b136d1c30d2a65e972e49a47 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 01:41:06 +0400 Subject: [PATCH 125/141] refactor(bindings): optimize imports --- .../bindings/anypointmq/AnypointMQMessageBinding.java | 3 +-- .../bindings/anypointmq/AnypointMQOperationBinding.java | 2 -- .../bindings/anypointmq/AnypointMQServerBinding.java | 2 -- .../bindings/googlepubsub/GooglePubSubChannelBinding.java | 5 +++-- .../bindings/kafka/v0/_1_0/server/KafkaServerBinding.java | 4 +++- .../bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java | 7 ++++--- .../bindings/mqtt5/v0/_1_0/server/MQTT5ServerBinding.java | 5 ++++- .../sns/v0/_1_0/channel/SNSChannelPolicyStatement.java | 2 -- .../solace/v0/_3_0/channel/SolaceChannelBinding.java | 1 - .../solace/v0/_3_0/message/SolaceMessageBinding.java | 1 - .../solace/v0/_4_0/channel/SolaceChannelBinding.java | 1 - .../solace/v0/_4_0/message/SolaceMessageBinding.java | 1 - .../bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java | 1 - .../bindings/sqs/v0/_1_0/message/SQSMessageBinding.java | 1 - .../sqs/v0/_1_0/operation/SQSOperationBinding.java | 1 - .../bindings/sqs/v0/_1_0/server/SQSServerBinding.java | 1 - .../com/asyncapi/bindings/stomp/STOMPChannelBinding.java | 1 - .../com/asyncapi/bindings/stomp/STOMPMessageBinding.java | 1 - .../com/asyncapi/bindings/stomp/STOMPOperationBinding.java | 1 - .../com/asyncapi/bindings/stomp/STOMPServerBinding.java | 1 - .../stomp/v0/_1_0/channel/STOMPChannelBinding.java | 2 -- .../stomp/v0/_1_0/message/STOMPMessageBinding.java | 2 -- .../stomp/v0/_1_0/operation/STOMPOperationBinding.java | 2 -- .../bindings/stomp/v0/_1_0/server/STOMPServerBinding.java | 2 -- 24 files changed, 15 insertions(+), 35 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java index ba1bbadb..8ccfb13e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQMessageBinding.java @@ -1,10 +1,9 @@ package com.asyncapi.bindings.anypointmq; import com.asyncapi.bindings.MessageBinding; -import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import lombok.*; +import lombok.EqualsAndHashCode; /** * Describes Anypoint MQ message binding. diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java index 0127d49f..f3f3da75 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQOperationBinding.java @@ -3,9 +3,7 @@ import com.asyncapi.bindings.OperationBinding; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; /** * Describes Anypoint MQ operation binding. diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java index 202d8ff8..34568af7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/AnypointMQServerBinding.java @@ -3,9 +3,7 @@ import com.asyncapi.bindings.ServerBinding; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; /** * Describes Anypoint MQ server binding. diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java index 57808d7c..803cca7d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/GooglePubSubChannelBinding.java @@ -1,8 +1,9 @@ package com.asyncapi.bindings.googlepubsub; import com.asyncapi.bindings.ChannelBinding; -import com.fasterxml.jackson.annotation.*; -import lombok.*; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.EqualsAndHashCode; /** * Describes Google Cloud Pub/Sub channel binding. diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/server/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/server/KafkaServerBinding.java index 22935131..58849664 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/server/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/server/KafkaServerBinding.java @@ -1,7 +1,9 @@ package com.asyncapi.bindings.kafka.v0._1_0.server; import com.fasterxml.jackson.annotation.JsonClassDescription; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java index 703ff655..31a10b17 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/message/MQTTMessageBinding.java @@ -1,8 +1,9 @@ package com.asyncapi.bindings.mqtt.v0._1_0.message; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/server/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/server/MQTT5ServerBinding.java index 8a8286d1..4a06cd40 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/server/MQTT5ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_1_0/server/MQTT5ServerBinding.java @@ -1,6 +1,9 @@ package com.asyncapi.bindings.mqtt5.v0._1_0.server; -import lombok.*; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java index 6b6eec49..4dd29012 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelPolicyStatement.java @@ -6,8 +6,6 @@ import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; -import java.util.List; - /** * The security policy for the SNS Topic. * diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java index 72e2d115..0572ea93 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/channel/SolaceChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.solace.v0._3_0.channel; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java index bd0e1239..5ee6a36c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/message/SolaceMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.solace.v0._3_0.message; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/channel/SolaceChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/channel/SolaceChannelBinding.java index 1669ce9b..ffda67b1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/channel/SolaceChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/channel/SolaceChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.solace.v0._4_0.channel; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/message/SolaceMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/message/SolaceMessageBinding.java index 32b1759e..c66b99be 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/message/SolaceMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/message/SolaceMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.solace.v0._4_0.message; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java index ce31ca24..48a89659 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/channel/SQSChannelBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.sqs.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java index 99f1af0a..cf117b73 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/message/SQSMessageBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.sqs.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java index 8db9ac6c..8cbf430e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/operation/SQSOperationBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.sqs.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java index 42078bd0..cf416eba 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_1_0/server/SQSServerBinding.java @@ -1,6 +1,5 @@ package com.asyncapi.bindings.sqs.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java index 2cc0f43c..bbf5b4ba 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPChannelBinding.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; /** * Describes STOMP channel binding. diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java index a235a75b..bdae67cc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPMessageBinding.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; /** * Describes STOMP message binding. diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java index 66913d53..0f4281b4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPOperationBinding.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; /** * Describes STOMP operation binding. diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java index 3257ef9a..2f61c8fd 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/STOMPServerBinding.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; /** * Describes STOMP server binding. diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java index 30b1178c..d02bf091 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/channel/STOMPChannelBinding.java @@ -1,9 +1,7 @@ package com.asyncapi.bindings.stomp.v0._1_0.channel; -import com.asyncapi.bindings.ChannelBinding; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java index 1fb47881..90dbf189 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/message/STOMPMessageBinding.java @@ -1,9 +1,7 @@ package com.asyncapi.bindings.stomp.v0._1_0.message; -import com.asyncapi.bindings.MessageBinding; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java index 9109cc67..7df44cf4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/operation/STOMPOperationBinding.java @@ -1,9 +1,7 @@ package com.asyncapi.bindings.stomp.v0._1_0.operation; -import com.asyncapi.bindings.OperationBinding; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java index 44daf0c8..51b9e125 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/stomp/v0/_1_0/server/STOMPServerBinding.java @@ -1,9 +1,7 @@ package com.asyncapi.bindings.stomp.v0._1_0.server; -import com.asyncapi.bindings.ServerBinding; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** From 69eb877bdaeaef5222e95c953f8638e9684dfcf7 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 01:43:53 +0400 Subject: [PATCH 126/141] refactor(bindings): move SerDe classes to serde package --- .../bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java | 2 +- .../mqtt/v0/_2_0/operation/MQTTOperationBinding.java | 2 +- .../bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java | 2 +- .../java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java | 6 +++--- .../src/main/java/com/asyncapi/schemas/json/JsonSchema.java | 6 +++--- .../com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java | 4 ++-- .../{jackson => serde}/SchemaAnyValueDeserializer.java | 2 +- .../AsyncAPISchemaAdditionalPropertiesDeserializer.java | 2 +- .../asyncapi}/AsyncAPISchemaAnyValueDeserializer.java | 3 ++- .../asyncapi}/AsyncAPISchemaItemsDeserializer.java | 2 +- .../ReferenceOrAsyncAPISchemaOrNumberDeserializer.java | 3 +-- .../ReferenceOrAsyncAPISchemaOrStringDeserializer.java | 3 +-- .../json}/JsonSchemaAnyValueDeserializer.java | 3 ++- .../json}/JsonSchemaItemsDeserializer.java | 2 +- .../json}/JsonSchemaPropertiesDeserializer.java | 2 +- .../OpenAPISchemaAdditionalPropertiesDeserializer.java | 2 +- .../openapi/OpenAPISchemaAnyValueDeserializer.java | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{jackson => serde}/SchemaAnyValueDeserializer.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{jackson => serde/asyncapi}/AsyncAPISchemaAdditionalPropertiesDeserializer.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{jackson => serde/asyncapi}/AsyncAPISchemaAnyValueDeserializer.java (76%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{jackson => serde/asyncapi}/AsyncAPISchemaItemsDeserializer.java (88%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/serde/{ => asyncapi}/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java (95%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/serde/{ => asyncapi}/ReferenceOrAsyncAPISchemaOrStringDeserializer.java (94%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{jackson => serde/json}/JsonSchemaAnyValueDeserializer.java (75%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{jackson => serde/json}/JsonSchemaItemsDeserializer.java (88%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{jackson => serde/json}/JsonSchemaPropertiesDeserializer.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{jackson => serde}/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/{jackson => serde}/openapi/OpenAPISchemaAnyValueDeserializer.java (76%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java index 41c2c0cc..97033b03 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.mqtt.v0._2_0.message; -import com.asyncapi.schemas.serde.ReferenceOrAsyncAPISchemaOrStringDeserializer; +import com.asyncapi.schemas.serde.asyncapi.ReferenceOrAsyncAPISchemaOrStringDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java index 31607851..69ce6336 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.mqtt.v0._2_0.operation; -import com.asyncapi.schemas.serde.ReferenceOrAsyncAPISchemaOrNumberDeserializer; +import com.asyncapi.schemas.serde.asyncapi.ReferenceOrAsyncAPISchemaOrNumberDeserializer; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java index edc17ed1..2fcfa199 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java @@ -1,6 +1,6 @@ package com.asyncapi.bindings.mqtt.v0._2_0.server; -import com.asyncapi.schemas.serde.ReferenceOrAsyncAPISchemaOrNumberDeserializer; +import com.asyncapi.schemas.serde.asyncapi.ReferenceOrAsyncAPISchemaOrNumberDeserializer; import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java index e893a3c1..541d3c48 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java @@ -1,9 +1,9 @@ package com.asyncapi.schemas.asyncapi; import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; -import com.asyncapi.schemas.jackson.AsyncAPISchemaAdditionalPropertiesDeserializer; -import com.asyncapi.schemas.jackson.AsyncAPISchemaAnyValueDeserializer; -import com.asyncapi.schemas.jackson.AsyncAPISchemaItemsDeserializer; +import com.asyncapi.schemas.serde.asyncapi.AsyncAPISchemaAdditionalPropertiesDeserializer; +import com.asyncapi.schemas.serde.asyncapi.AsyncAPISchemaAnyValueDeserializer; +import com.asyncapi.schemas.serde.asyncapi.AsyncAPISchemaItemsDeserializer; import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/json/JsonSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/json/JsonSchema.java index 9be5f8e5..c6ee1db8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/json/JsonSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/json/JsonSchema.java @@ -1,8 +1,8 @@ package com.asyncapi.schemas.json; -import com.asyncapi.schemas.jackson.JsonSchemaAnyValueDeserializer; -import com.asyncapi.schemas.jackson.JsonSchemaItemsDeserializer; -import com.asyncapi.schemas.jackson.JsonSchemaPropertiesDeserializer; +import com.asyncapi.schemas.serde.json.JsonSchemaAnyValueDeserializer; +import com.asyncapi.schemas.serde.json.JsonSchemaItemsDeserializer; +import com.asyncapi.schemas.serde.json.JsonSchemaPropertiesDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java index 06b6e07c..106b3fa6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.openapi.v3._0_0; -import com.asyncapi.schemas.jackson.openapi.OpenAPISchemaAdditionalPropertiesDeserializer; -import com.asyncapi.schemas.jackson.openapi.OpenAPISchemaAnyValueDeserializer; +import com.asyncapi.schemas.serde.openapi.OpenAPISchemaAdditionalPropertiesDeserializer; +import com.asyncapi.schemas.serde.openapi.OpenAPISchemaAnyValueDeserializer; import com.asyncapi.schemas.openapi.v3._0_0.properties.Discriminator; import com.asyncapi.schemas.openapi.v3._0_0.properties.Extensions; import com.asyncapi.schemas.openapi.v3._0_0.properties.ExternalDocumentation; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/SchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/SchemaAnyValueDeserializer.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/SchemaAnyValueDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/SchemaAnyValueDeserializer.java index f691351a..37c0e958 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/SchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/SchemaAnyValueDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.jackson; +package com.asyncapi.schemas.serde; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaAdditionalPropertiesDeserializer.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaAdditionalPropertiesDeserializer.java index a83887b1..364cdc87 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaAdditionalPropertiesDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.jackson; +package com.asyncapi.schemas.serde.asyncapi; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaAnyValueDeserializer.java similarity index 76% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaAnyValueDeserializer.java index cb5c5da3..3741150f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaAnyValueDeserializer.java @@ -1,6 +1,7 @@ -package com.asyncapi.schemas.jackson; +package com.asyncapi.schemas.serde.asyncapi; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.serde.SchemaAnyValueDeserializer; /** * AsyncAPI Schema any value deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java similarity index 88% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java index ebdef48e..665d8af5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/AsyncAPISchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.jackson; +package com.asyncapi.schemas.serde.asyncapi; import com.asyncapi.v3.jackson.SchemaItemsDeserializer; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java similarity index 95% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java index da44fc8b..8e50d691 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/ReferenceOrAsyncAPISchemaOrNumberDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.serde; +package com.asyncapi.schemas.serde.asyncapi; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.asyncapi.Reference; @@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrStringDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/ReferenceOrAsyncAPISchemaOrStringDeserializer.java similarity index 94% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrStringDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/ReferenceOrAsyncAPISchemaOrStringDeserializer.java index 7cdd01ab..c3293d1c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/ReferenceOrAsyncAPISchemaOrStringDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/ReferenceOrAsyncAPISchemaOrStringDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.serde; +package com.asyncapi.schemas.serde.asyncapi; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.asyncapi.Reference; @@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaAnyValueDeserializer.java similarity index 75% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaAnyValueDeserializer.java index 4d26fb49..e3cbc0df 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaAnyValueDeserializer.java @@ -1,5 +1,6 @@ -package com.asyncapi.schemas.jackson; +package com.asyncapi.schemas.serde.json; +import com.asyncapi.schemas.serde.SchemaAnyValueDeserializer; import com.asyncapi.schemas.json.JsonSchema; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java similarity index 88% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java index 156872ea..8e4f473f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.jackson; +package com.asyncapi.schemas.serde.json; import com.asyncapi.v3.jackson.SchemaItemsDeserializer; import com.asyncapi.schemas.json.JsonSchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaPropertiesDeserializer.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaPropertiesDeserializer.java index d6c5be6c..b4e5d32e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/JsonSchemaPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaPropertiesDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.jackson; +package com.asyncapi.schemas.serde.json; import com.asyncapi.schemas.json.JsonSchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java index 43d025d7..1dda0475 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.jackson.openapi; +package com.asyncapi.schemas.serde.openapi; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; import com.fasterxml.jackson.core.JsonParser; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAnyValueDeserializer.java similarity index 76% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAnyValueDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAnyValueDeserializer.java index 11c44c0b..71f145a0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/jackson/openapi/OpenAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAnyValueDeserializer.java @@ -1,6 +1,6 @@ -package com.asyncapi.schemas.jackson.openapi; +package com.asyncapi.schemas.serde.openapi; -import com.asyncapi.schemas.jackson.SchemaAnyValueDeserializer; +import com.asyncapi.schemas.serde.SchemaAnyValueDeserializer; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; /** From 622221e7a218beab671aaf2db39836b961164120 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 01:45:32 +0400 Subject: [PATCH 127/141] refactor(bindings): move SerDe classes to serde package --- .../asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java | 2 +- .../java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaArray.java | 2 +- .../java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaEnum.java | 2 +- .../java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMap.java | 2 +- .../asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecordField.java | 2 +- .../java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaUnion.java | 2 +- .../avro/v1/_9_0/{jackson => serde}/AvroSchemaDeserializer.java | 2 +- .../avro/v1/_9_0/{jackson => serde}/AvroTypeDeserializer.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/{jackson => serde}/AvroSchemaDeserializer.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/{jackson => serde}/AvroTypeDeserializer.java (97%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java index 7647a650..856fbce6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java @@ -4,7 +4,7 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; import com.asyncapi.schemas.avro.v1._9_0.AvroSchemaUnion; -import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroSchemaDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.serde.AvroSchemaDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaArray.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaArray.java index 305d135f..107103eb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaArray.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaArray.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.serde.AvroTypeDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaEnum.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaEnum.java index 0a4d80f5..6d3b308b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaEnum.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaEnum.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.serde.AvroTypeDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMap.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMap.java index 7439a0d6..ca200cec 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMap.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaMap.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.serde.AvroTypeDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecordField.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecordField.java index 658b0b8e..7171c53a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecordField.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaRecordField.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.serde.AvroTypeDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaUnion.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaUnion.java index 5438133f..64568a1b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaUnion.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/AvroSchemaUnion.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.avro.v1._9_0; -import com.asyncapi.schemas.avro.v1._9_0.jackson.AvroTypeDeserializer; +import com.asyncapi.schemas.avro.v1._9_0.serde.AvroTypeDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.jetbrains.annotations.NotNull; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/serde/AvroSchemaDeserializer.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/serde/AvroSchemaDeserializer.java index c2af8a7b..64441238 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroSchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/serde/AvroSchemaDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.avro.v1._9_0.jackson; +package com.asyncapi.schemas.avro.v1._9_0.serde; import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroTypeDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/serde/AvroTypeDeserializer.java similarity index 97% rename from asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroTypeDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/serde/AvroTypeDeserializer.java index e1de2721..13f692e4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/jackson/AvroTypeDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/avro/v1/_9_0/serde/AvroTypeDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.schemas.avro.v1._9_0.jackson; +package com.asyncapi.schemas.avro.v1._9_0.serde; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; import com.asyncapi.schemas.avro.v1._9_0.AvroSchemaUnion; From bc502641b68b951c1db7f730f176f52371186415 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 01:48:29 +0400 Subject: [PATCH 128/141] refactor(bindings): remove unused classes --- ...hemasAdditionalPropertiesDeserializer.java | 38 -------------- .../v2/jackson/SchemaItemsDeserializer.java | 51 ------------------- 2 files changed, 89 deletions(-) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java deleted file mode 100644 index d37882ff..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.asyncapi.v2._0_0.jackson.model.schema; - -import com.asyncapi.schemas.asyncapi.AsyncAPISchema; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; - -/** - * Deserialize Schema additional properties - * - * @author Guillaume LAMIRAND (guillaume.lamirand at graviteesource.com) - * @author GraviteeSource Team - */ -public class SchemasAdditionalPropertiesDeserializer extends JsonDeserializer { - - @Override - public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - ObjectCodec objectCodec = p.getCodec(); - JsonNode node = objectCodec.readTree(p); - - return chooseKnownPojo(node, objectCodec); - } - - private Object chooseKnownPojo(JsonNode jsonNode, final ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - if (jsonNode.isBoolean()) { - return jsonNode.asBoolean(); - } else { - return jsonParser.readValueAs(AsyncAPISchema.class); - } - } - } -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java deleted file mode 100644 index cc98fdf3..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/SchemaItemsDeserializer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.asyncapi.v2.jackson; - -import com.asyncapi.schemas.asyncapi.AsyncAPISchema; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeType; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -public class SchemaItemsDeserializer extends JsonDeserializer { - - @Override - public Object deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { - ObjectCodec objectCodec = jsonParser.getCodec(); - JsonNode node = objectCodec.readTree(jsonParser); - JsonNodeType nodeType = node.getNodeType(); - if (nodeType == JsonNodeType.OBJECT) { - return readAsSchema(node, objectCodec); - } - if (nodeType == JsonNodeType.ARRAY) { - return readAsListOfSchemas((ArrayNode) node, objectCodec); - } - return readAsObject(node, objectCodec); - } - - private List readAsListOfSchemas(ArrayNode arrayNode, ObjectCodec objectCodec) throws IOException { - List schemaList = new ArrayList<>(); - for (JsonNode childNode : arrayNode) { - schemaList.add(readAsSchema(childNode, objectCodec)); - } - return schemaList; - } - - private AsyncAPISchema readAsSchema(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - try (JsonParser parser = jsonNode.traverse(objectCodec)) { - return parser.readValueAs(AsyncAPISchema.class); - } - } - - private Object readAsObject(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - return jsonParser.readValueAs(Object.class); - } - } -} From f5b2975aa4d2bf9320c4a00a98386832fc808466 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 01:57:07 +0400 Subject: [PATCH 129/141] refactor(bindings): use common SerDe for models + package-info --- .../AsyncAPISchemaItemsDeserializer.java | 2 +- .../json/JsonSchemaItemsDeserializer.java | 2 +- ...ListOfReferencesOrObjectsDeserializer.java | 2 +- .../MapOfReferencesOrObjectsDeserializer.java | 2 +- .../jackson => serde}/ObjectDeserializer.java | 2 +- .../ReferenceOrObjectDeserializer.java | 2 +- .../SchemaItemsDeserializer.java | 2 +- .../java/com/asyncapi/serde/package-info.java | 7 ++ .../ChannelParametersDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessagePayloadDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../OperationMessageDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsSchemasDeserializer.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageHeadersDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../channel/message/MessagesDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../ComponentsCorrelationIdsDeserializer.java | 2 +- .../ComponentsMessageTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- ...ComponentsOperationTraitsDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- ...ComponentsServerVariablesDeserializer.java | 2 +- .../ComponentsServersDeserializer.java | 2 +- .../model/schema/SchemaDeserializer.java | 2 +- .../server/ServerVariablesDeserializer.java | 2 +- .../model/server/ServersDeserializer.java | 2 +- .../MapOfReferencesOrObjectsDeserializer.java | 80 ------------------- .../ReferenceOrObjectDeserializer.java | 61 -------------- .../ExternalDocumentationDeserializer.java | 2 +- .../_0_0/jackson/model/TagsDeserializer.java | 2 +- .../ChannelParametersDeserializer.java | 2 +- .../model/channel/ChannelsDeserializer.java | 2 +- .../MessageCorrelationIdDeserializer.java | 2 +- .../message/MessageTraitsDeserializer.java | 2 +- .../channel/message/MessagesDeserializer.java | 2 +- .../ComponentsChannelsDeserializer.java | 2 +- .../ComponentsCorrelationIdsDeserializer.java | 2 +- .../ComponentsExternalDocsDeserializer.java | 2 +- .../ComponentsMessageTraitsDeserializer.java | 2 +- .../ComponentsMessagesDeserializer.java | 2 +- ...ComponentsOperationTraitsDeserializer.java | 2 +- .../ComponentsOperationsDeserializer.java | 2 +- .../ComponentsParametersDeserializer.java | 2 +- .../ComponentsRepliesDeserializer.java | 2 +- .../ComponentsReplyAddressesDeserializer.java | 2 +- ...ComponentsSecuritySchemesDeserializer.java | 2 +- ...ComponentsServerVariablesDeserializer.java | 2 +- .../ComponentsServersDeserializer.java | 2 +- .../component/ComponentsTagsDeserializer.java | 2 +- .../OperationTraitsDeserializer.java | 2 +- .../operation/OperationsDeserializer.java | 2 +- .../OperationReplyAddressDeserializer.java | 2 +- .../reply/OperationReplyDeserializer.java | 2 +- .../server/ServerVariablesDeserializer.java | 2 +- .../model/server/ServersDeserializer.java | 2 +- ...ListOfReferencesOrObjectsDeserializer.java | 51 ------------ .../SecuritySchemesDeserializer.java | 2 +- 67 files changed, 70 insertions(+), 255 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v2/jackson => serde}/ListOfReferencesOrObjectsDeserializer.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson => serde}/MapOfReferencesOrObjectsDeserializer.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v2/jackson => serde}/ObjectDeserializer.java (96%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson => serde}/ReferenceOrObjectDeserializer.java (98%) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson => serde}/SchemaItemsDeserializer.java (98%) create mode 100644 asyncapi-core/src/main/java/com/asyncapi/serde/package-info.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/jackson/MapOfReferencesOrObjectsDeserializer.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ReferenceOrObjectDeserializer.java delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v3/jackson/ListOfReferencesOrObjectsDeserializer.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java index 665d8af5..b113e37d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.serde.asyncapi; -import com.asyncapi.v3.jackson.SchemaItemsDeserializer; +import com.asyncapi.serde.SchemaItemsDeserializer; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java index 8e4f473f..1ef59da1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java @@ -1,6 +1,6 @@ package com.asyncapi.schemas.serde.json; -import com.asyncapi.v3.jackson.SchemaItemsDeserializer; +import com.asyncapi.serde.SchemaItemsDeserializer; import com.asyncapi.schemas.json.JsonSchema; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ListOfReferencesOrObjectsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/serde/ListOfReferencesOrObjectsDeserializer.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ListOfReferencesOrObjectsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/serde/ListOfReferencesOrObjectsDeserializer.java index 4a2baf05..c84193e7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ListOfReferencesOrObjectsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/serde/ListOfReferencesOrObjectsDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.jackson; +package com.asyncapi.serde; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/MapOfReferencesOrObjectsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/serde/MapOfReferencesOrObjectsDeserializer.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/MapOfReferencesOrObjectsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/serde/MapOfReferencesOrObjectsDeserializer.java index 53d967a7..d7aec3fb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/MapOfReferencesOrObjectsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/serde/MapOfReferencesOrObjectsDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson; +package com.asyncapi.serde; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ObjectDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/serde/ObjectDeserializer.java similarity index 96% rename from asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ObjectDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/serde/ObjectDeserializer.java index 553750ac..43b10540 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ObjectDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/serde/ObjectDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v2.jackson; +package com.asyncapi.serde; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/ReferenceOrObjectDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/serde/ReferenceOrObjectDeserializer.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/ReferenceOrObjectDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/serde/ReferenceOrObjectDeserializer.java index b9b34882..1afed6d5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/ReferenceOrObjectDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/serde/ReferenceOrObjectDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson; +package com.asyncapi.serde; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/SchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/serde/SchemaItemsDeserializer.java similarity index 98% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/SchemaItemsDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/serde/SchemaItemsDeserializer.java index 7307e5c4..c55fd719 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/SchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/serde/SchemaItemsDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson; +package com.asyncapi.serde; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/asyncapi-core/src/main/java/com/asyncapi/serde/package-info.java b/asyncapi-core/src/main/java/com/asyncapi/serde/package-info.java new file mode 100644 index 00000000..60293814 --- /dev/null +++ b/asyncapi-core/src/main/java/com/asyncapi/serde/package-info.java @@ -0,0 +1,7 @@ +/** + * Provides common classes for Serialization or Deserialization of AsyncAPI and it's components. + * + * @author Pavel Bodiachevskii + * @since 1.0.0-RC2 + */ +package com.asyncapi.serde; \ No newline at end of file diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java index 6a525ffd..a3a1fccf 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes channel parameters map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index 8de1429a..c57f6cfe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.CorrelationId; -import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Serializes message traits list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 1de47436..31922958 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; -import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Serializes message traits list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java index 157b0bfd..ee65c8b2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessagePayloadDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.jackson.model.channel.message; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; -import com.asyncapi.v2.jackson.ObjectDeserializer; +import com.asyncapi.serde.ObjectDeserializer; /** * Serializes message traits list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java index c7a40ce7..21340269 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.MessageTrait; -import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; /** * Serializes message traits list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java index dfc36526..c6b619ed 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationMessageDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.Message; -import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Serializes operation message list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java index 1a2b62b0..f0e57f5d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/channel/operation/OperationTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait; -import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; /** * Serializes operation traits list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java index 4d233275..e1f4b209 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.message.Message; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes component security schemes map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java index f5fd4b6b..b1c112af 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._0_0.model.channel.Parameter; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes channel parameters map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java index 19c106f0..9317979a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSchemasDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes component schemas map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index f1d11ca7..46ac1a33 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._0_0.jackson.model.component; import com.asyncapi.schemas.asyncapi.Reference; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java index 1fdb9bd4..c6a2037b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.Parameter; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes channel parameters map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index f032e74a..43109fb8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.CorrelationId; -import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Serializes message correlation id. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java index 0c239626..c4c2627a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageHeadersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.asyncapi.Reference; -import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Serializes message traits list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java index 97c87410..fb969fc3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.MessageTrait; -import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; /** * Serializes message traits list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java index 12bf3c67..1cbe7c27 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/message/MessagesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; -import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; /** * Serializes messages list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java index 2829171a..4c11a6d4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/channel/operation/OperationTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait; -import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; /** * Serializes operation traits list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java index 06575e8e..840876e3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.CorrelationId; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsCorrelationIdsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java index fd30297d..46d2b5d9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.MessageTrait; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsMessageTraitsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java index bb7b28ea..c3e56b49 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.message.Message; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsMessagesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java index 1c1064b0..e6cf90da 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsOperationTraitsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java index b0eb2aa3..b6ea590a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.channel.Parameter; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsParametersDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index a1d752b0..363e63c8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v2._6_0.jackson.model.component; import com.asyncapi.schemas.asyncapi.Reference; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; import com.asyncapi.schemas.asyncapi.security.v2.SecurityScheme; public class ComponentsSecuritySchemesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java index 2c93bfb9..b13030af 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServerVariablesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.ServerVariable; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsServerVariablesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java index 29c46e6a..4e1bedb4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/component/ComponentsServersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.Server; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsServersDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java index 4997801c..ab926508 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemaDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; -import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Serializes component servers map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java index 9034374b..2c0789e9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServerVariablesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.ServerVariable; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes {@link com.asyncapi.v2._6_0.model.server.Server} variables map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java index 807bceca..7db29e83 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/server/ServersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v2._6_0.model.server.Server; -import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes component servers map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/MapOfReferencesOrObjectsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/MapOfReferencesOrObjectsDeserializer.java deleted file mode 100644 index 2fb73bc1..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/MapOfReferencesOrObjectsDeserializer.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.asyncapi.v2.jackson; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -/** - * Deserializes AsyncAPI map of parameters - * @param object - */ -public abstract class MapOfReferencesOrObjectsDeserializer extends JsonDeserializer> { - - abstract public Class objectTypeClass(); - - abstract public Class referenceClass(); - - @Override - public Map deserialize(JsonParser jsonParser, - DeserializationContext deserializationContext - ) throws IOException, JsonProcessingException { - ObjectCodec objectCodec = jsonParser.getCodec(); - JsonNode map = objectCodec.readTree(jsonParser); - - Map parameters = new HashMap<>(); - - map.fieldNames().forEachRemaining( - fieldName -> { - /* - Problem: - Both, Reference class and Schema class have $ref field. - So, this is only reason why I receive next exception: - "com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: - Unrecognized field "title" (class com.asyncapi.v2._6_0.model.Reference), - not marked as ignorable (one known property: "$ref"])" - in case when Schema contains $ref. - Solution: - Try to deserialize reference. In case of exception, try to deserialize it as given ObjectType. In case of - one more exception, throw it. - TODO: Think how to improve. - */ - try { - parameters.put(fieldName, chooseKnownPojo(map.get(fieldName), objectCodec)); - } catch (IOException ignore) { - try { - parameters.put(fieldName, readAsObject(map.get(fieldName), objectCodec)); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - ); - - return parameters; - } - - private Object chooseKnownPojo(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - JsonNode ref = jsonNode.get("$ref"); - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - if (ref != null) { - return jsonParser.readValueAs(referenceClass()); - } else { - return jsonParser.readValueAs(objectTypeClass()); - } - } - } - - private Object readAsObject(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - return jsonParser.readValueAs(objectTypeClass()); - } - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ReferenceOrObjectDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ReferenceOrObjectDeserializer.java deleted file mode 100644 index a378ee70..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/jackson/ReferenceOrObjectDeserializer.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.asyncapi.v2.jackson; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; - -import java.io.IOException; - -public abstract class ReferenceOrObjectDeserializer extends JsonDeserializer { - - abstract public Class objectTypeClass(); - - abstract public Class referenceClass(); - - @Override - public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - ObjectCodec objectCodec = p.getCodec(); - JsonNode node = objectCodec.readTree(p); - - /* - Problem: - Both, Reference class and Schema class have $ref field. - So, this is only reason why I receive next exception: - "com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: - Unrecognized field "title" (class com.asyncapi.v2._6_0.model.Reference), - not marked as ignorable (one known property: "$ref"])" - in case when Schema contains $ref. - Solution: - Try to deserialize reference. In case of exception, try to deserialize it as given ObjectType. In case of - one more exception, throw it. - TODO: Think how to improve. - */ - try { - return chooseKnownPojo(node, objectCodec); - } catch (UnrecognizedPropertyException unrecognizedPropertyException) { - return readAsObject(node, objectCodec); - } - } - - private Object chooseKnownPojo(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - JsonNode ref = jsonNode.get("$ref"); - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - if (ref != null) { - return jsonParser.readValueAs(referenceClass()); - } else { - return jsonParser.readValueAs(objectTypeClass()); - } - } - } - - private Object readAsObject(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - return jsonParser.readValueAs(objectTypeClass()); - } - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java index 2c954d9b..5600b99b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/ExternalDocumentationDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; -import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Deserializes external documentation. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java index b1a733cf..f2f3d07f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/TagsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.Tag; -import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; /** * Deserializes tags. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java index 63eab13d..70bef43f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelParametersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Parameter; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes {@link com.asyncapi.v3._0_0.model.channel.Parameter} variables map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java index 849e6160..4bacfb8c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/ChannelsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Channel; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes component channels map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java index 51d7442f..9adef810 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageCorrelationIdDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.CorrelationId; -import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Serializes message correlation id. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java index f38c5a3b..bacdf014 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessageTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.MessageTrait; -import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; /** * Deserializes message traits. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java index f4beb44d..38a83c52 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/channel/message/MessagesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.Message; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes {@link Message} variables map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java index 20d32210..1077bb7f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsChannelsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Channel; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsChannelsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java index 3c8b21cf..beb773d3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsCorrelationIdsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.CorrelationId; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsCorrelationIdsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java index b4426a0c..c0b58032 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsExternalDocsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.ExternalDocumentation; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsExternalDocsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java index 5a4ee4f5..fd37ca2d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessageTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.MessageTrait; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsMessageTraitsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java index 41b6df7f..c8219c55 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsMessagesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.message.Message; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsMessagesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java index b2b065b6..0c9dd2b2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.OperationTrait; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsOperationTraitsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java index 8e1b96ae..5e6379b1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsOperationsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.Operation; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsOperationsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java index 6a6458d8..9c326f29 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsParametersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.channel.Parameter; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsParametersDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java index d9456d15..fb46d2f3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsRepliesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsRepliesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java index 7896054e..a094bf78 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsReplyAddressesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsReplyAddressesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java index 0416889e..ed8bca44 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsSecuritySchemesDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v3._0_0.jackson.model.component; import com.asyncapi.schemas.asyncapi.Reference; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; public class ComponentsSecuritySchemesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java index aa980d0e..a3a99ad9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServerVariablesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.ServerVariable; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsServerVariablesDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java index d77469a3..043a1a80 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsServersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.Server; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsServersDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java index 0c36d846..77e00a31 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/component/ComponentsTagsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.Tag; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; public class ComponentsTagsDeserializer extends MapOfReferencesOrObjectsDeserializer { diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java index a715839b..8a50cb5a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationTraitsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.OperationTrait; -import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; /** * Serializes operation traits list. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java index 8434e978..fdb1b034 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/OperationsDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.Operation; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes component operations map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java index cda3109c..1661e4f9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyAddressDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReplyAddress; -import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Serializes operation reply address diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java index 966353a0..61ef57d9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/operation/reply/OperationReplyDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; -import com.asyncapi.v3.jackson.ReferenceOrObjectDeserializer; +import com.asyncapi.serde.ReferenceOrObjectDeserializer; /** * Serializes operation reply diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java index b74b5738..450b650f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServerVariablesDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.ServerVariable; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes {@link com.asyncapi.v3._0_0.model.server.Server} variables map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java index e0a654e7..c3f13865 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/jackson/model/server/ServersDeserializer.java @@ -2,7 +2,7 @@ import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.v3._0_0.model.server.Server; -import com.asyncapi.v3.jackson.MapOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.MapOfReferencesOrObjectsDeserializer; /** * Serializes component servers map. diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/ListOfReferencesOrObjectsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/ListOfReferencesOrObjectsDeserializer.java deleted file mode 100644 index e4212093..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/ListOfReferencesOrObjectsDeserializer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.asyncapi.v3.jackson; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -public abstract class ListOfReferencesOrObjectsDeserializer extends JsonDeserializer> { - - abstract public Class objectTypeClass(); - - abstract public Class referenceClass(); - - @Override - public List deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - ObjectCodec objectCodec = p.getCodec(); - JsonNode node = objectCodec.readTree(p); - - List traits = new ArrayList<>(); - - node.forEach( - traitsValue -> { - try { - traits.add(chooseKnownPojo(traitsValue, objectCodec)); - } catch (IOException e) { - e.printStackTrace(); - } - } - ); - - return traits; - } - - private Object chooseKnownPojo(JsonNode jsonNode, ObjectCodec objectCodec) throws IOException { - JsonNode ref = jsonNode.get("$ref"); - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - if (ref != null) { - return jsonParser.readValueAs(referenceClass()); - } else { - return jsonParser.readValueAs(objectTypeClass()); - } - } - } - -} diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java index 53d9ad86..f593b62f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.v3.jackson.security_scheme; import com.asyncapi.schemas.asyncapi.Reference; -import com.asyncapi.v3.jackson.ListOfReferencesOrObjectsDeserializer; +import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; /** From ac626b0cb622678d26e651406fa3943905b5c676 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 02:00:04 +0400 Subject: [PATCH 130/141] refactor(schemas): optimize imports optimize imports - don't use wildcard --- .../com/asyncapi/schemas/asyncapi/AsyncAPISchema.java | 10 +++++++--- .../schemas/asyncapi/multiformat/AvroFormatSchema.java | 2 +- .../asyncapi/multiformat/MultiFormatSchema.java | 2 +- .../schemas/asyncapi/security/v2/SecurityScheme.java | 2 +- .../asyncapi/security/v2/oauth2/OAuthFlows.java | 2 +- .../asyncapi/security/v3/ApiKeySecurityScheme.java | 6 +++++- .../security/v3/OpenIdConnectSecurityScheme.java | 6 +++++- .../schemas/asyncapi/security/v3/SecurityScheme.java | 6 +++++- .../security/v3/http/HttpApiKeySecurityScheme.java | 6 +++++- .../asyncapi/security/v3/http/HttpSecurityScheme.java | 6 +++++- .../security/v3/oauth2/OAuth2SecurityScheme.java | 6 +++++- .../asyncapi/security/v3/oauth2/OAuthFlows.java | 6 +++++- .../v3/oauth2/flow/AuthorizationCodeOAuthFlow.java | 6 +++++- .../v3/oauth2/flow/ClientCredentialsOAuthFlow.java | 6 +++++- .../security/v3/oauth2/flow/ImplicitOAuthFlow.java | 6 +++++- .../asyncapi/security/v3/oauth2/flow/OAuthFlow.java | 6 +++++- .../security/v3/oauth2/flow/PasswordOAuthFlow.java | 6 +++++- .../schemas/openapi/v3/_0_0/OpenAPISchema.java | 10 +++++++--- .../v3/_0_0/properties/ExternalDocumentation.java | 6 +++++- .../schemas/openapi/v3/_0_0/properties/XML.java | 6 +++++- .../asyncapi/AsyncAPISchemaItemsDeserializer.java | 2 +- .../serde/json/JsonSchemaAnyValueDeserializer.java | 2 +- .../serde/json/JsonSchemaItemsDeserializer.java | 2 +- .../openapi/OpenAPISchemaAnyValueDeserializer.java | 2 +- 24 files changed, 92 insertions(+), 28 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java index 541d3c48..de15caf6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/AsyncAPISchema.java @@ -1,14 +1,18 @@ package com.asyncapi.schemas.asyncapi; -import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; +import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; import com.asyncapi.schemas.serde.asyncapi.AsyncAPISchemaAdditionalPropertiesDeserializer; import com.asyncapi.schemas.serde.asyncapi.AsyncAPISchemaAnyValueDeserializer; import com.asyncapi.schemas.serde.asyncapi.AsyncAPISchemaItemsDeserializer; -import com.asyncapi.schemas.asyncapi.multiformat.MultiFormatSchema; +import com.asyncapi.v3._0_0.jackson.model.ExternalDocumentationDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import javax.validation.constraints.Min; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java index 856fbce6..029a0728 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/AvroFormatSchema.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.asyncapi.multiformat; -import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.schemas.avro.v1._9_0.AvroSchema; import com.asyncapi.schemas.avro.v1._9_0.AvroSchemaUnion; import com.asyncapi.schemas.avro.v1._9_0.serde.AvroSchemaDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/MultiFormatSchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/MultiFormatSchema.java index 68868a9e..6a6e1cb9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/MultiFormatSchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/multiformat/MultiFormatSchema.java @@ -1,8 +1,8 @@ package com.asyncapi.schemas.asyncapi.multiformat; +import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.schemas.asyncapi.Reference; -import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/SecurityScheme.java index 591cf51a..70d96608 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/SecurityScheme.java @@ -1,8 +1,8 @@ package com.asyncapi.schemas.asyncapi.security.v2; import com.asyncapi.schemas.asyncapi.ExtendableObject; -import com.asyncapi.schemas.asyncapi.security.v2.http.HttpSecurityScheme; import com.asyncapi.schemas.asyncapi.security.v2.http.HttpApiKeySecurityScheme; +import com.asyncapi.schemas.asyncapi.security.v2.http.HttpSecurityScheme; import com.asyncapi.schemas.asyncapi.security.v2.oauth2.OAuth2SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuthFlows.java index e4533cf7..595859ea 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v2/oauth2/OAuthFlows.java @@ -2,9 +2,9 @@ import com.asyncapi.schemas.asyncapi.ExtendableObject; import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.AuthorizationCodeOAuthFlow; -import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.PasswordOAuthFlow; import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ClientCredentialsOAuthFlow; import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.ImplicitOAuthFlow; +import com.asyncapi.schemas.asyncapi.security.v2.oauth2.flow.PasswordOAuthFlow; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/ApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/ApiKeySecurityScheme.java index 253dd6a1..7297efd2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/ApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/ApiKeySecurityScheme.java @@ -1,7 +1,11 @@ package com.asyncapi.schemas.asyncapi.security.v3; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/OpenIdConnectSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/OpenIdConnectSecurityScheme.java index c6621a17..00d29367 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/OpenIdConnectSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/OpenIdConnectSecurityScheme.java @@ -1,6 +1,10 @@ package com.asyncapi.schemas.asyncapi.security.v3; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/SecurityScheme.java index cae6ab45..26ff8cfe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/SecurityScheme.java @@ -7,7 +7,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpApiKeySecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpApiKeySecurityScheme.java index 5c811a04..6c96ebbb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpApiKeySecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpApiKeySecurityScheme.java @@ -2,7 +2,11 @@ import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpSecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpSecurityScheme.java index 8df54621..2a7ab5cb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpSecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/http/HttpSecurityScheme.java @@ -1,7 +1,11 @@ package com.asyncapi.schemas.asyncapi.security.v3.http; import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuth2SecurityScheme.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuth2SecurityScheme.java index 391cbb9f..cce42f84 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuth2SecurityScheme.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuth2SecurityScheme.java @@ -1,7 +1,11 @@ package com.asyncapi.schemas.asyncapi.security.v3.oauth2; import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuthFlows.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuthFlows.java index 52027a0a..4eb8e6cb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuthFlows.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/OAuthFlows.java @@ -5,7 +5,11 @@ import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ClientCredentialsOAuthFlow; import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.ImplicitOAuthFlow; import com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow.PasswordOAuthFlow; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java index b8c5b32a..92169159 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/AuthorizationCodeOAuthFlow.java @@ -1,7 +1,11 @@ package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; import com.asyncapi.schemas.asyncapi.ExtendableObject; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java index f3c4e65e..3658133a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ClientCredentialsOAuthFlow.java @@ -1,7 +1,11 @@ package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; import com.asyncapi.schemas.asyncapi.ExtendableObject; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ImplicitOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ImplicitOAuthFlow.java index cbddcbfd..e17cbcf8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ImplicitOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/ImplicitOAuthFlow.java @@ -1,7 +1,11 @@ package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; import com.asyncapi.schemas.asyncapi.ExtendableObject; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/OAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/OAuthFlow.java index 5c260a3b..ec3d492f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/OAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/OAuthFlow.java @@ -1,7 +1,11 @@ package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; import com.asyncapi.schemas.asyncapi.ExtendableObject; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/PasswordOAuthFlow.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/PasswordOAuthFlow.java index b64194b0..3ce24c18 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/PasswordOAuthFlow.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/asyncapi/security/v3/oauth2/flow/PasswordOAuthFlow.java @@ -1,7 +1,11 @@ package com.asyncapi.schemas.asyncapi.security.v3.oauth2.flow; import com.asyncapi.schemas.asyncapi.ExtendableObject; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java index 106b3fa6..b805632f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/OpenAPISchema.java @@ -1,14 +1,18 @@ package com.asyncapi.schemas.openapi.v3._0_0; -import com.asyncapi.schemas.serde.openapi.OpenAPISchemaAdditionalPropertiesDeserializer; -import com.asyncapi.schemas.serde.openapi.OpenAPISchemaAnyValueDeserializer; import com.asyncapi.schemas.openapi.v3._0_0.properties.Discriminator; import com.asyncapi.schemas.openapi.v3._0_0.properties.Extensions; import com.asyncapi.schemas.openapi.v3._0_0.properties.ExternalDocumentation; import com.asyncapi.schemas.openapi.v3._0_0.properties.XML; +import com.asyncapi.schemas.serde.openapi.OpenAPISchemaAdditionalPropertiesDeserializer; +import com.asyncapi.schemas.serde.openapi.OpenAPISchemaAnyValueDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import java.math.BigDecimal; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExternalDocumentation.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExternalDocumentation.java index 099a7fdc..63b3ab6b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExternalDocumentation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/ExternalDocumentation.java @@ -2,7 +2,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/XML.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/XML.java index 5df5a9d7..4a8cf72e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/XML.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/openapi/v3/_0_0/properties/XML.java @@ -2,7 +2,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java index b113e37d..04bda181 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/AsyncAPISchemaItemsDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.serde.asyncapi; -import com.asyncapi.serde.SchemaItemsDeserializer; import com.asyncapi.schemas.asyncapi.AsyncAPISchema; +import com.asyncapi.serde.SchemaItemsDeserializer; /** * AsyncAPI Schema items deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaAnyValueDeserializer.java index e3cbc0df..2a858cab 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaAnyValueDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.serde.json; -import com.asyncapi.schemas.serde.SchemaAnyValueDeserializer; import com.asyncapi.schemas.json.JsonSchema; +import com.asyncapi.schemas.serde.SchemaAnyValueDeserializer; /** * Json Schema any value deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java index 1ef59da1..4cff6df8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/json/JsonSchemaItemsDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.serde.json; -import com.asyncapi.serde.SchemaItemsDeserializer; import com.asyncapi.schemas.json.JsonSchema; +import com.asyncapi.serde.SchemaItemsDeserializer; /** * Json Schema items deserializer diff --git a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAnyValueDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAnyValueDeserializer.java index 71f145a0..b93b381b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAnyValueDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/openapi/OpenAPISchemaAnyValueDeserializer.java @@ -1,7 +1,7 @@ package com.asyncapi.schemas.serde.openapi; -import com.asyncapi.schemas.serde.SchemaAnyValueDeserializer; import com.asyncapi.schemas.openapi.v3._0_0.OpenAPISchema; +import com.asyncapi.schemas.serde.SchemaAnyValueDeserializer; /** * OpenAPI Schema any value deserializer From 1ffc3bc2dfdcc4ebb2090bacf5b776ed5e691020 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 02:00:51 +0400 Subject: [PATCH 131/141] refactor(schemas): optimize imports - don't use wildcard --- .../bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java | 6 +++++- .../channel/exchange/AMQPChannelExchangeProperties.java | 6 +++++- .../v0/_1_0/channel/queue/AMQPChannelQueueProperties.java | 6 +++++- .../bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java | 6 +++++- .../amqp/v0/_1_0/operation/AMQPOperationBinding.java | 6 +++++- .../bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java | 6 +++++- .../channel/exchange/AMQPChannelExchangeProperties.java | 6 +++++- .../v0/_2_0/channel/queue/AMQPChannelQueueProperties.java | 6 +++++- .../bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java | 6 +++++- .../amqp/v0/_2_0/operation/AMQPOperationBinding.java | 6 +++++- .../bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java | 6 +++++- .../channel/exchange/AMQPChannelExchangeProperties.java | 6 +++++- .../v0/_3_0/channel/queue/AMQPChannelQueueProperties.java | 6 +++++- .../bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java | 6 +++++- .../amqp/v0/_3_0/operation/AMQPOperationBinding.java | 6 +++++- .../v0/_0_1/channel/AnypointMQChannelBinding.java | 6 +++++- .../v0/_0_1/message/AnypointMQMessageBinding.java | 6 +++++- .../v0/_1_0/channel/GooglePubSubChannelBinding.java | 6 +++++- .../channel/GooglePubSubChannelMessageStoragePolicy.java | 6 +++++- .../v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java | 6 +++++- .../v0/_1_0/message/GooglePubSubMessageBinding.java | 6 +++++- .../_1_0/message/GooglePubSubMessageSchemaDefinition.java | 6 +++++- .../v0/_2_0/channel/GooglePubSubChannelBinding.java | 6 +++++- .../channel/GooglePubSubChannelMessageStoragePolicy.java | 6 +++++- .../v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java | 6 +++++- .../v0/_2_0/message/GooglePubSubMessageBinding.java | 6 +++++- .../_2_0/message/GooglePubSubMessageSchemaDefinition.java | 6 +++++- .../bindings/http/v0/_1_0/message/HTTPMessageBinding.java | 6 +++++- .../http/v0/_1_0/operation/HTTPOperationBinding.java | 6 +++++- .../bindings/http/v0/_2_0/message/HTTPMessageBinding.java | 6 +++++- .../http/v0/_2_0/operation/HTTPOperationBinding.java | 6 +++++- .../bindings/http/v0/_3_0/message/HTTPMessageBinding.java | 6 +++++- .../http/v0/_3_0/operation/HTTPOperationBinding.java | 6 +++++- .../bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java | 6 +++++- .../ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java | 6 +++++- .../ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java | 6 +++++- .../bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java | 6 +++++- .../bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java | 6 +++++- .../bindings/jms/v0/_0_1/channel/JMSChannelBinding.java | 6 +++++- .../bindings/jms/v0/_0_1/message/JMSMessageBinding.java | 6 +++++- .../bindings/jms/v0/_0_1/server/JMSServerBinding.java | 6 +++++- .../bindings/kafka/v0/_1_0/message/KafkaMessageBinding.java | 6 +++++- .../kafka/v0/_1_0/operation/KafkaOperationBinding.java | 6 +++++- .../bindings/kafka/v0/_3_0/channel/KafkaChannelBinding.java | 6 +++++- .../bindings/kafka/v0/_3_0/message/KafkaMessageBinding.java | 6 +++++- .../kafka/v0/_3_0/operation/KafkaOperationBinding.java | 6 +++++- .../bindings/kafka/v0/_3_0/server/KafkaServerBinding.java | 6 +++++- .../bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java | 6 +++++- .../bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java | 6 +++++- .../kafka/v0/_4_0/operation/KafkaOperationBinding.java | 6 +++++- .../bindings/kafka/v0/_4_0/server/KafkaServerBinding.java | 6 +++++- .../bindings/kafka/v0/_5_0/channel/KafkaChannelBinding.java | 6 +++++- .../bindings/kafka/v0/_5_0/message/KafkaMessageBinding.java | 6 +++++- .../kafka/v0/_5_0/operation/KafkaOperationBinding.java | 6 +++++- .../bindings/kafka/v0/_5_0/server/KafkaServerBinding.java | 6 +++++- .../mqtt/v0/_1_0/operation/MQTTOperationBinding.java | 6 +++++- .../bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java | 6 +++++- .../bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java | 6 +++++- .../mqtt/v0/_2_0/operation/MQTTOperationBinding.java | 6 +++++- .../bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java | 6 +++++- .../bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java | 6 +++++- .../nats/v0/_1_0/operation/NATSOperationBinding.java | 6 +++++- .../pulsar/v0/_1_0/channel/PulsarChannelBinding.java | 6 +++++- .../v0/_1_0/channel/PulsarChannelRetentionDefinition.java | 6 +++++- .../bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java | 6 +++++- .../bindings/sns/v0/_1_0/channel/SNSChannelBinding.java | 6 +++++- .../bindings/sns/v0/_1_0/operation/SNSOperationBinding.java | 6 +++++- .../solace/v0/_2_0/operation/SolaceOperationBinding.java | 6 +++++- .../bindings/solace/v0/_2_0/server/SolaceServerBinding.java | 6 +++++- .../solace/v0/_3_0/operation/SolaceOperationBinding.java | 6 +++++- .../bindings/solace/v0/_3_0/server/SolaceServerBinding.java | 6 +++++- .../solace/v0/_4_0/operation/SolaceOperationBinding.java | 6 +++++- .../bindings/solace/v0/_4_0/server/SolaceServerBinding.java | 6 +++++- .../bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java | 6 +++++- .../bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java | 6 +++++- 75 files changed, 375 insertions(+), 75 deletions(-) diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java index 7caf5bd3..826b5fd5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/AMQPChannelBinding.java @@ -5,7 +5,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java index 158cb4bc..86aabe36 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/exchange/AMQPChannelExchangeProperties.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java index 344abdba..28b56b26 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/channel/queue/AMQPChannelQueueProperties.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java index 74a05fc7..249dd59f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/message/AMQPMessageBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java index 93828e19..e4a15fe3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_1_0/operation/AMQPOperationBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java index 96b3af38..6ff30319 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/AMQPChannelBinding.java @@ -5,7 +5,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java index 2d74bbc1..18471275 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/exchange/AMQPChannelExchangeProperties.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java index 720f7dd1..8a55855c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/channel/queue/AMQPChannelQueueProperties.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java index 476b4755..5a1b0b8b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/message/AMQPMessageBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java index 7b67847e..6c5f26ed 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_2_0/operation/AMQPOperationBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java index fc4ef8dc..2edb0f0b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/AMQPChannelBinding.java @@ -5,7 +5,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java index 076e598e..5eb623df 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/exchange/AMQPChannelExchangeProperties.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java index b4489147..a84f0183 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/channel/queue/AMQPChannelQueueProperties.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java index 0e83bcf2..7cad35c5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/message/AMQPMessageBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java index 96671071..d5d3a181 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/amqp/v0/_3_0/operation/AMQPOperationBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java index 8076124b..1d8d38e1 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/channel/AnypointMQChannelBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java index 22890390..6b4ae45a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/anypointmq/v0/_0_1/message/AnypointMQMessageBinding.java @@ -4,7 +4,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java index 0a1b553f..e5cdfecc 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java index 12dfcaba..1077649b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelMessageStoragePolicy.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java index 46aa45d3..96d6f646 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/channel/GooglePubSubChannelSchemaSettings.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java index 7b5a6b4b..80795b1b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java index 2d1b8ed0..db017077 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_1_0/message/GooglePubSubMessageSchemaDefinition.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java index f18f0649..94761ffe 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java index 13a4218f..173538d7 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelMessageStoragePolicy.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java index 120b1548..a62aa1e4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/channel/GooglePubSubChannelSchemaSettings.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java index d1904cb2..a563310b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java index 3e36aa59..84d10108 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/googlepubsub/v0/_2_0/message/GooglePubSubMessageSchemaDefinition.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java index a1cb612f..8cf67315 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/message/HTTPMessageBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java index fcd63d58..171e750f 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_1_0/operation/HTTPOperationBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java index 7ca1a1f1..757b0e73 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/message/HTTPMessageBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java index c72e96d7..a913b63b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_2_0/operation/HTTPOperationBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java index 7baaae10..1eb13ed9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/message/HTTPMessageBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java index c55eb41b..a6244877 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/http/v0/_3_0/operation/HTTPOperationBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java index aa684b8c..382ca084 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java index 4055b4a2..0298cfae 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelQueueProperties.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java index a01c3a0b..cf2a35aa 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/channel/IBMMQChannelTopicProperties.java @@ -2,7 +2,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java index d5c9a82b..b82ba5f9 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/message/IBMMQMessageBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java index 4013e37e..865ee718 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/ibmmq/v0/_1_0/server/IBMMQServerBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java index eeccc8e0..e6333ed4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/channel/JMSChannelBinding.java @@ -1,7 +1,11 @@ package com.asyncapi.bindings.jms.v0._0_1.channel; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java index 4a47b611..9c4dfeac 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/message/JMSMessageBinding.java @@ -2,7 +2,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java index 6e2c6724..ea3232a4 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/jms/v0/_0_1/server/JMSServerBinding.java @@ -1,7 +1,11 @@ package com.asyncapi.bindings.jms.v0._0_1.server; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/message/KafkaMessageBinding.java index 2fc4d1a8..be54ca33 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/message/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/message/KafkaMessageBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/operation/KafkaOperationBinding.java index 2844f2c4..2ec8d6df 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/operation/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_1_0/operation/KafkaOperationBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/channel/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/channel/KafkaChannelBinding.java index fc5d367a..238f777c 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/channel/KafkaChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/channel/KafkaChannelBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageBinding.java index 6b6cace6..2c38844d 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/message/KafkaMessageBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/operation/KafkaOperationBinding.java index 5b00fc68..f001d703 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/operation/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/operation/KafkaOperationBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/server/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/server/KafkaServerBinding.java index 08458e48..c6ef13fb 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/server/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_3_0/server/KafkaServerBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java index e0e9d6db..99185e84 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/channel/KafkaChannelBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java index 96e47a1c..04b4cfb0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/message/KafkaMessageBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java index d8df88a4..e635670a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/operation/KafkaOperationBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java index 6fa12d1d..ab2b2678 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_4_0/server/KafkaServerBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelBinding.java index ef2cf779..e7c8f475 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/channel/KafkaChannelBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageBinding.java index 5f24fcff..5fbc6220 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/message/KafkaMessageBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/operation/KafkaOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/operation/KafkaOperationBinding.java index 1ee0b104..46b68882 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/operation/KafkaOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/operation/KafkaOperationBinding.java @@ -3,7 +3,11 @@ import com.asyncapi.schemas.asyncapi.AsyncAPISchema; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/server/KafkaServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/server/KafkaServerBinding.java index e9637d77..7aafff0e 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/server/KafkaServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/kafka/v0/_5_0/server/KafkaServerBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java index 95cf4982..d6b7f1ba 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/operation/MQTTOperationBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java index f7461bde..8fec8ff8 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_1_0/server/MQTTServerBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java index 97033b03..c4ccf1de 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/message/MQTTMessageBinding.java @@ -2,7 +2,11 @@ import com.asyncapi.schemas.serde.asyncapi.ReferenceOrAsyncAPISchemaOrStringDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java index 69ce6336..e8b9b57a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/operation/MQTTOperationBinding.java @@ -5,7 +5,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java index 2fcfa199..cd924d17 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt/v0/_2_0/server/MQTTServerBinding.java @@ -5,7 +5,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java index 3701febd..f43c7f09 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/mqtt5/v0/_2_0/server/MQTT5ServerBinding.java @@ -1,6 +1,10 @@ package com.asyncapi.bindings.mqtt5.v0._2_0.server; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java index afdfb2f3..0f66c03a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/nats/v0/_1_0/operation/NATSOperationBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java index d53520c2..a1533cf3 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java index cc99bc71..f78cca24 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/channel/PulsarChannelRetentionDefinition.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java index 3e82e1a6..35f78494 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/pulsar/v0/_1_0/server/PulsarServerBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java index 1932fcf5..07c428e6 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/channel/SNSChannelBinding.java @@ -1,6 +1,10 @@ package com.asyncapi.bindings.sns.v0._1_0.channel; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java index 24ec0d9b..a7784f7a 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sns/v0/_1_0/operation/SNSOperationBinding.java @@ -1,6 +1,10 @@ package com.asyncapi.bindings.sns.v0._1_0.operation; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationBinding.java index f471b238..d289c976 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/operation/SolaceOperationBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/server/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/server/SolaceServerBinding.java index 61e3440c..a340d3b0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/server/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_2_0/server/SolaceServerBinding.java @@ -2,7 +2,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java index 961731f5..22b1473b 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/operation/SolaceOperationBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java index b08af49e..35075207 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_3_0/server/SolaceServerBinding.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.annotation.JsonClassDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationBinding.java index b4e565b7..0fd66087 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/operation/SolaceOperationBinding.java @@ -2,7 +2,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/server/SolaceServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/server/SolaceServerBinding.java index 036cf5dc..c71fbf75 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/server/SolaceServerBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/solace/v0/_4_0/server/SolaceServerBinding.java @@ -2,7 +2,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; /** diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java index 82fe9c2a..ab75c4df 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/channel/SQSChannelBinding.java @@ -1,6 +1,10 @@ package com.asyncapi.bindings.sqs.v0._2_0.channel; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java index effcafe3..9e4c4851 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java +++ b/asyncapi-core/src/main/java/com/asyncapi/bindings/sqs/v0/_2_0/operation/SQSOperationBinding.java @@ -1,6 +1,10 @@ package com.asyncapi.bindings.sqs.v0._2_0.operation; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; From f5a6a347eb0dddbfaaea40b6f29114bf468a632a Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 02:03:28 +0400 Subject: [PATCH 132/141] refactor(schemas): move SecuritySchemesDeserializer to schemas package --- .../asyncapi/security/v3}/SecuritySchemesDeserializer.java | 2 +- .../java/com/asyncapi/v3/_0_0/model/operation/Operation.java | 2 +- .../com/asyncapi/v3/_0_0/model/operation/OperationTrait.java | 2 +- .../src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename asyncapi-core/src/main/java/com/asyncapi/{v3/jackson/security_scheme => schemas/serde/asyncapi/security/v3}/SecuritySchemesDeserializer.java (90%) diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/security/v3/SecuritySchemesDeserializer.java similarity index 90% rename from asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java rename to asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/security/v3/SecuritySchemesDeserializer.java index f593b62f..3f8285d0 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/jackson/security_scheme/SecuritySchemesDeserializer.java +++ b/asyncapi-core/src/main/java/com/asyncapi/schemas/serde/asyncapi/security/v3/SecuritySchemesDeserializer.java @@ -1,4 +1,4 @@ -package com.asyncapi.v3.jackson.security_scheme; +package com.asyncapi.schemas.serde.asyncapi.security.v3; import com.asyncapi.schemas.asyncapi.Reference; import com.asyncapi.serde.ListOfReferencesOrObjectsDeserializer; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java index ca792682..28337fb5 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/Operation.java @@ -11,7 +11,7 @@ import com.asyncapi.v3._0_0.model.operation.reply.OperationReply; import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.OperationBindingsDeserializer; -import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; +import com.asyncapi.schemas.serde.asyncapi.security.v3.SecuritySchemesDeserializer; import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java index bf7d3cdd..94e78144 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/operation/OperationTrait.java @@ -8,7 +8,7 @@ import com.asyncapi.v3._0_0.model.Tag; import com.asyncapi.bindings.OperationBinding; import com.asyncapi.bindings.OperationBindingsDeserializer; -import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; +import com.asyncapi.schemas.serde.asyncapi.security.v3.SecuritySchemesDeserializer; import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.*; diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java index ce2d2686..b4aa06d2 100644 --- a/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java +++ b/asyncapi-core/src/main/java/com/asyncapi/v3/_0_0/model/server/Server.java @@ -9,7 +9,7 @@ import com.asyncapi.v3._0_0.jackson.model.TagsDeserializer; import com.asyncapi.v3._0_0.model.ExternalDocumentation; import com.asyncapi.v3._0_0.model.Tag; -import com.asyncapi.v3.jackson.security_scheme.SecuritySchemesDeserializer; +import com.asyncapi.schemas.serde.asyncapi.security.v3.SecuritySchemesDeserializer; import com.asyncapi.schemas.asyncapi.security.v3.SecurityScheme; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; From 9bbdcc8df8a533a80fd196904c9f387595f9b5fb Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 02:25:09 +0400 Subject: [PATCH 133/141] refactor(models): remove unused classes --- ...hemasAdditionalPropertiesDeserializer.java | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java b/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java deleted file mode 100644 index e1fca6f8..00000000 --- a/asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/jackson/model/schema/SchemasAdditionalPropertiesDeserializer.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.asyncapi.v2._6_0.jackson.model.schema; - -import com.asyncapi.schemas.asyncapi.AsyncAPISchema; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; - -/** - * Deserialize Schema additional properties - * - * @author Guillaume LAMIRAND (guillaume.lamirand at graviteesource.com) - * @author GraviteeSource Team - */ -public class SchemasAdditionalPropertiesDeserializer extends JsonDeserializer { - - @Override - public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - ObjectCodec objectCodec = p.getCodec(); - JsonNode node = objectCodec.readTree(p); - - return chooseKnownPojo(node, objectCodec); - } - - private Object chooseKnownPojo(JsonNode jsonNode, final ObjectCodec objectCodec) throws IOException { - try (JsonParser jsonParser = jsonNode.traverse(objectCodec)) { - if (jsonNode.isBoolean()) { - return jsonNode.asBoolean(); - } else { - return jsonParser.readValueAs(AsyncAPISchema.class); - } - } - } -} From cc2af7ef8ac7832a990b9833a3b19f9d02a80ebc Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 02:25:21 +0400 Subject: [PATCH 134/141] docs: update README --- README.md | 5 +---- asyncapi-core/README.md | 19 +++++-------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 90105287..e032e1fb 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,6 @@

Building the future of event-driven architectures

We're on a mission to standardize message-based communication and increase interoperability of the different systems out there.
---- -> ⚠️ This project doesn't support AsyncAPI 1.x ---- - [![Version](https://img.shields.io/maven-central/v/com.asyncapi/asyncapi-core?logo=apache-maven)](https://central.sonatype.com/artifact/com.asyncapi/asyncapi-core/1.0.0-RC) ## Overview @@ -19,6 +15,7 @@ Hints: ## Known consumers: - [Springwolf Core](https://github.com/springwolf/springwolf-core) - Automated documentation for async APIs built with Spring Boot - [AsyncAPI Quarkus](https://github.com/quarkiverse/quarkus-asyncapi) - Generates AsyncAPIRegistry and configuration classes for Quarkus +- [Specmatic](https://specmatic.in) - Converts AsyncAPI specifications into executable contracts ## Known open specifications to check compatibility with: - [x] [adeo-kafka-request-reply-asyncapi.yml](https://github.com/asyncapi/spec/blob/master/examples/adeo-kafka-request-reply-asyncapi.yml) diff --git a/asyncapi-core/README.md b/asyncapi-core/README.md index e1c491c3..8239b3af 100644 --- a/asyncapi-core/README.md +++ b/asyncapi-core/README.md @@ -1,11 +1,7 @@ -

-
- AsyncAPI logo -

-

Building the future of event-driven architectures

-
We're on a mission to standardize message-based communication and increase interoperability of the different systems out there.
+[![AsyncAPI Logo](../assets/logo.png)](https://www.asyncapi.com) -> ⚠️ This project doesn't support AsyncAPI 1.x +

Building the future of event-driven architectures

+
We're on a mission to standardize message-based communication and increase interoperability of the different systems out there.
This submodule stores projection of AsyncAPI specification to java classes. Each class is being properly annotated with `jsr-305` annotations, which allows to use it in null-safety languages like `kotlin` without extra headache. @@ -14,7 +10,7 @@ which allows to use it in null-safety languages like `kotlin` without extra head com.asyncapi asyncapi-core - 1.0.0-EAP-2 + 1.0.0-RC2 ``` @@ -25,9 +21,4 @@ For manual working with AsyncAPI specification from java/kotlin code: ```kotlin var asyncApi = objectMapper.readValue(model, AsyncAPI::class.java) -``` - -### Generating of AsyncAPI Specification while building: -For generating of AsyncAPI specification from hand-crafted AsyncAPI class at choosed build cycle step use one of implemented plugins: -* [Gradle plugin](../asyncapi-plugin/asyncapi-plugin-gradle) -* [Maven plugin](../asyncapi-plugin/asyncapi-plugin-maven) +``` \ No newline at end of file From 4a5b633c18cb787df1efdf65fdf6ac23235d7d23 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 02:33:27 +0400 Subject: [PATCH 135/141] build: test scope for org.jetbrains.kotlin:kotlin-test --- asyncapi-core/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/asyncapi-core/pom.xml b/asyncapi-core/pom.xml index 845eaae4..144288f7 100644 --- a/asyncapi-core/pom.xml +++ b/asyncapi-core/pom.xml @@ -30,6 +30,7 @@ org.jetbrains.kotlin kotlin-test + test com.fasterxml.jackson.module From 0fef1dec15ea5fcc028a900ede8753686f78f226 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Wed, 15 May 2024 02:43:30 +0400 Subject: [PATCH 136/141] build: 1.0.0-RC2 CHANGELOG --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 836c4dff..2df7e993 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.0-RC2] - TBA +### Added + +- AsyncAPI 2.6.0 message parses Avro, Json and OpenAPI schemas + ### Changed +- Bindings were updated: + - AMQP: 0.1.0, 0.2.0, 0.3.0 + - AMQP1: 0.1.0 + - Anypoint MQ: 0.1.0 + - Google Cloud Pub/Sub: 0.1.0, 0.2.0 + - HTTP: 0.1.0, 0.2.0, 0.3.0, 0.4.0, 0.5.0 + - IBM MQ: 0.1.0 + - JMS: 0.0.1 + - Apache Kafka: 0.1.0, 0.3.0, 0.4.0, 0.5.0 + - Mercure: 0.1.0 + - MQTT: 0.1.0, 0.2.0 + - MQTT 5: 0.1.0, 0.2.0 + - NATS: 0.1.0 + - Apache Pulsar: 0.1.0 + - Redis: 0.1.0 + - Amazon SNS: 0.1.0 + - Solace: 0.1.0, 0.2.0, 0.3.0, 0.4.0 + - Amazon SQS: 0.1.0, 0.2.0 + - STOMP: 0.1.0 + - WebSockets: 0.1.0 - All schemas now are located in `schemas` package - All bindings now are located in `bindings` package - Bindings structure was changed. Each binding now holds `channel`, `server`, `message`, `operation` inside package From 51167abdaf1bfcc702141098c5f030062c3b5050 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 16 May 2024 02:05:22 +0400 Subject: [PATCH 137/141] docs: README --- README.md | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/README.md b/README.md index e032e1fb..f2ddefbb 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,70 @@ Hints: - If you are working with AsyncAPI specification in JetBrains IDE, check out our [AsyncAPI - IDEA plugin](https://github.com/asyncapi/jasyncapi-idea-plugin) - If you are working with AsyncAPI specification in VSCode, check out our [AsyncAPI - VSCode plugin](https://github.com/asyncapi/vs-asyncapi-preview) +### Implemented AsyncAPI versions (3/8) + +| Version | Implementation status | +|---------|-----------------------| +| 2.0.0 | ✅ | +| 2.1.0 | ❌ | +| 2.2.0 | ❌ | +| 2.3.0 | ❌ | +| 2.4.0 | ❌ | +| 2.5.0 | ❌ | +| 2.6.0 | ✅ | +| 3.0.0 | ✅ | + +### Implemented AsyncAPI schemas (4/6) + +| Protocol | Versions | +|------------------|-------------------------------------------------------------| +| AsyncAPI Schema | unified version | +| Avro Schema | 1.9.0, 1.9.1, 1.9.2, 1.10.0, 1.10.1, 1.10.2, 1.11.0, 1.11.1 | +| Json Schema | Draft-07 | +| OpenAPI Schema | 3.0.0, 3.0.1, 3.0.2, 3.0.3 | +| RAML 1.0 Schema | ❌ | +| Protocol Buffers | ❌ | + +### Implemented AsyncAPI bindings (19/19) + +| Protocol | Versions | +|----------------------|-----------------------------------| +| AMQP | 0.1.0, 0.2.0, 0.3.0 | +| AMQP1 | 0.1.0 | +| Anypoint MQ | 0.1.0 | +| Google Cloud Pub/Sub | 0.1.0, 0.2.0 | +| HTTP | 0.1.0, 0.2.0, 0.3.0, 0.4.0, 0.5.0 | +| IBM MQ | 0.1.0 | +| JMS | 0.0.1 | +| Apache Kafka | 0.1.0, 0.3.0, 0.4.0, 0.5.0 | +| Mercure | 0.1.0 | +| MQTT | 0.1.0, 0.2.0 | +| MQTT 5 | 0.1.0, 0.2.0 | +| NATS | 0.1.0 | +| Apache Pulsar | 0.1.0 | +| Redis | 0.1.0 | +| Amazon SNS | 0.1.0 | +| Solace | 0.1.0, 0.2.0, 0.3.0, 0.4.0 | +| Amazon SQS | 0.1.0, 0.2.0 | +| STOMP | 0.1.0 | +| WebSockets | 0.1.0 | + +### Implemented AsyncAPI Security Schemas (12/12) +| Security Schema | Implementation status | +|-----------------------|-----------------------| +| API Key | ✅ | +| Asymmetric Encryption | ✅ | +| GSS-API | ✅ | +| HTTP | ✅ | +| HTTP API Key | ✅ | +| OAuth2 | ✅ | +| OpenID Connect | ✅ | +| Plain | ✅ | +| SCRAM-SHA-256 | ✅ | +| SCRAM-SHA-512 | ✅ | +| Symmetric Encryption | ✅ | +| User Password | ✅ | + ## Known consumers: - [Springwolf Core](https://github.com/springwolf/springwolf-core) - Automated documentation for async APIs built with Spring Boot - [AsyncAPI Quarkus](https://github.com/quarkiverse/quarkus-asyncapi) - Generates AsyncAPIRegistry and configuration classes for Quarkus From c8b5e4780475d51b97ac7756d19348aabd150fb5 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 16 May 2024 02:06:33 +0400 Subject: [PATCH 138/141] docs: README --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f2ddefbb..80b9e408 100644 --- a/README.md +++ b/README.md @@ -27,14 +27,15 @@ Hints: ### Implemented AsyncAPI schemas (4/6) -| Protocol | Versions | -|------------------|-------------------------------------------------------------| -| AsyncAPI Schema | unified version | -| Avro Schema | 1.9.0, 1.9.1, 1.9.2, 1.10.0, 1.10.1, 1.10.2, 1.11.0, 1.11.1 | -| Json Schema | Draft-07 | -| OpenAPI Schema | 3.0.0, 3.0.1, 3.0.2, 3.0.3 | -| RAML 1.0 Schema | ❌ | -| Protocol Buffers | ❌ | +| Protocol | Versions | +|------------------------------|-------------------------------------------------------------| +| AsyncAPI Multi Format Schema | 3.0.0 | +| AsyncAPI Schema | unified version | +| Avro Schema | 1.9.0, 1.9.1, 1.9.2, 1.10.0, 1.10.1, 1.10.2, 1.11.0, 1.11.1 | +| Json Schema | Draft-07 | +| OpenAPI Schema | 3.0.0, 3.0.1, 3.0.2, 3.0.3 | +| RAML 1.0 Schema | ❌ | +| Protocol Buffers | ❌ | ### Implemented AsyncAPI bindings (19/19) From 63dd63f05bd2c1aa15b9633a4e2be33b2ba966a3 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 16 May 2024 02:06:52 +0400 Subject: [PATCH 139/141] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80b9e408..f77c6cb3 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Hints: | 2.6.0 | ✅ | | 3.0.0 | ✅ | -### Implemented AsyncAPI schemas (4/6) +### Implemented AsyncAPI schemas (5/7) | Protocol | Versions | |------------------------------|-------------------------------------------------------------| From abefed3fcce8420b84c76762425eee213862432b Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 16 May 2024 15:19:29 +0400 Subject: [PATCH 140/141] release: 1.0.0-RC2 --- README.md | 2 +- asyncapi-core/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f77c6cb3..fbbe813e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

Building the future of event-driven architectures

We're on a mission to standardize message-based communication and increase interoperability of the different systems out there.
-[![Version](https://img.shields.io/maven-central/v/com.asyncapi/asyncapi-core?logo=apache-maven)](https://central.sonatype.com/artifact/com.asyncapi/asyncapi-core/1.0.0-RC) +[![Version](https://img.shields.io/maven-central/v/com.asyncapi/asyncapi-core/1.0.0-RC2?logo=apache-maven)](https://central.sonatype.com/artifact/com.asyncapi/asyncapi-core/1.0.0-RC2) ## Overview JVM-friendly bindings for AsyncAPI. It allows you to read or write specifications for your asynchronous API through code diff --git a/asyncapi-core/pom.xml b/asyncapi-core/pom.xml index 144288f7..41befac9 100644 --- a/asyncapi-core/pom.xml +++ b/asyncapi-core/pom.xml @@ -6,7 +6,7 @@ asyncapi com.asyncapi - 1.0.0-RC + 1.0.0-RC2 4.0.0 diff --git a/pom.xml b/pom.xml index 20f0a813..803cfb94 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.asyncapi asyncapi - 1.0.0-RC + 1.0.0-RC2 AsyncAPI From ab800fd8fd5048f2b4e160b12356835e629bf0d4 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Thu, 16 May 2024 15:21:08 +0400 Subject: [PATCH 141/141] docs: CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2df7e993..68092660 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.0.0-RC2] - TBA +## [1.0.0-RC2] - 2024-05-16 ### Added

KeywordDescription